Comments on: GIT Fatal You Have not Concluded Your Merge MERGE_HEAD Exists

By: Trevor

Trevor — Tue, 27 Apr 2010 08:29:06 +0000

I had a conflict with several files, which I fixed. Then I got this warning and I did as evan said for each file:
git commit -a
then I tried to pull from the other directory again and found everything was “up-to-date”

By: michael

michael — Thu, 04 Mar 2010 16:39:57 +0000

Yeah that makes sense. Unfortunately for me even after that it wouldn’t let me commit. I like GIT but there are a few gotchas for sure.

By: Will

Will — Wed, 03 Mar 2010 00:58:48 +0000

It wouldn’t let me commit either until I did a git add on the file I had to manually merge.

By: michael

michael — Tue, 02 Mar 2010 19:42:34 +0000

That’s interesting and I’m glad it worked for you. In my case it wouldn’t even let me commit.

By: Evan

Evan — Tue, 02 Mar 2010 04:18:00 +0000

FYI, for anyone else who stumbles across this page like I did (by searching that error message): All I needed to do was commit.