CODEWITHSUNDEEP
gitgithubmergesublimetextgit-branch
user8873738
user8873738

Reputation:

Merging in Git doesn't open the code editor (Sublime)

I'm trying to merge two branches in Git and my Sublime editor won't open up, even though I have set it up as my default text editor and it was working just fine until now. It shows this message:

Auto-merging xxxxx.js

CONFLICT (content): Merge conflict in xxxxx.js

Automatic merge failed; fix conflicts and then commit the result.

Upvotes: 1

Views: 891

Answers (1)

Code-Apprentice
Code-Apprentice

Reputation: 83517

The editor does not appear because the merge failed with conflicts. On a merge or commit, the editor is used to enter a commit message when one is not provided by other means. In this case, you need to resolve the merge conflicts and then commit the changes. After you do this, you will see the editor appear so that you can edit the commit message for the merge.

Upvotes: 1

Related Questions