The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Source Tree pull You have not concluded your merge (MERGE_HEAD exists).

Deleted user
October 17, 2013

I am trying to perform a pull and it keeps erroring out that I have not concluded the merge. Where do I find merge? There are no pending files and no conflicts.

1 answer

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

4 votes
HarryH
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Champions.
January 22, 2014

Try git commit first.

If it doens't work, you need to run:

git merge --abort

git reset --merge

TAGS
AUG Leaders

Atlassian Community Events