Git says a file is unmerged and I can't commit, but the file seems to be merged
I had exactly the same situation today on branches merging (not rebasing).
I spot, that file it errors on, in your case:
U app/models/disclosure_event.rb
was absent in git status. But is could be seen as unmerged in gitk GUI. It also was absent in working copy (moved to another place in my case).
I tried git rm
, and it solved the problem:
git rm app/models/disclosure_event.rb