About this question
I merged branch dog into animal. When I go to commit, I get the following:
Unmerged paths:
(use "git reset HEAD..." to unstage) (use "git add..." to mark resolution both deleted: ../public/images/originals/dog.ai
added by them: ../public/images/original_files/dog.ai
To make a long story short, I had different directory names and file names in each branch. Animal branch has the changes that I want.
When I go to reset the head, it doesn't work. And when I go to take any other git action (remove, checkout, etc), I get a path not found error.
What commands do I need to execute?
