1

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.

Improve this question
2
  • 1
    AFAIK, git will only open the editor when a merge is successful and it needs a commit message. Since you have merge conflicts, you need to manually resolve the conflicts and then commit. Commented Nov 2, 2017 at 17:15
  • @Code-Apprentice is correct. The code editor is for the commit message, but since the merge can't complete automatically, git doesn't ask for a commit message. Commented Nov 2, 2017 at 17:51

1 Answer 1

Reset to default
1

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.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.