How do I get out of this state?

[Michael Mossey]

I'm getting "you have not concluded your merge (Merge head exists)" when I try to pull or push in this state of the repository. I tried other things as well, and always get this message

What should I do?

[Ana Retamal · Accepted solution]

Hi Michael!

This is not an issue with Sourcetree, but with Git. I'd recommend you to use the terminal for this and check the status of your repository (git status). If there are any conflicts you'll need to resolve them and after that add them (git add). If there aren't any unmerged files then you can do git commit.

Maybe these other responses from the Community will be useful too:

• https://community.atlassian.com/t5/Sourcetree-questions/Merge-issue/qaq-p/240348
• https://community.atlassian.com/t5/Sourcetree-questions/Source-Tree-pull-You-have-not-concluded-your-merge-MERGE-HEAD/qaq-p/181852

Hope that helps!

Ana

[Michael Mossey]

That was easy. Just going to the command line and typing 'git commit' was all that was necessary.

[Ana Retamal]

Happy to hear that :) 

Have a good day!