How to resolve git status “Unmerged paths:”?

Question

I merged branch dog into animal. When I go to commit, I get the following:

Unmerged paths:
(use "git reset HEAD ..         


        

Answer 1

All you should need to do is:

# if the file in the right place isn't already committed:
git add 

# remove the "both deleted" file from the index:
git rm --cached ../public/images/originals/dog.ai

# commit the merge:
git commit