Git says a file is unmerged and I can't commit, but the file seems to be merged

git merge conflict
Adam Albrecht picture Adam Albrecht · Jul 23, 2011 · Viewed 86.5k times · Source

I had about 12 file conflicts when I merged branches. I manually fixed all the conflicts and staged the files. But now when I try to commit, it says one of the files is unmerged.

U      app/models/disclosure_event.rb
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.

When I type git status, it shows all the changed files, including "disclosure_event.rb", under Changes to be committed. It shows no files as unstaged. I've repeatedly tried to add the file, but it seems to do nothing. If I open the file, everything looks great.

Any ideas? I'm completely stuck.

Answer

Ryan Stewart picture Ryan Stewart · Jul 23, 2011

I can't tell you what's wrong, but you might try

git reset app/models/disclosure_even.rb
git add app/models/disclosure_even.rb

and then commit.

Related questions

Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

I've started Eclipse EGit. In some scenarios it is really not comprehensive. I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says: Checkout conflict with files: i.e. pulling …

Read More
How can I discard remote changes and mark a file as "resolved"?

I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my local changes and ignore the remote changes causing conflicts. Is there a command I can use to …

Read More
Trouble merging upstream changes back into my branch

I'm running into conflicts while trying to merge upstream changes back into my branch and I'm not sure how to resolve them. I created my own fork. I cloned it. I made changes to the branch on my fork, committed, …

Read More