title: How to resolve git status "Unmerged paths:"?
body: <p>I merged branch <code>dog</code> into <code>animal</code>.  When I go to commit, I get the following:</p>
  <pre><code>Unmerged paths:
  (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
  (use &quot;git add &lt;file&gt;...&quot; to mark resolution
  both deleted:       ../public/images/originals/dog.ai
  added by them:      ../public/images/original_files/dog.ai
  </code></pre>
  <p>I had different directory names and file names in each branch.  The <code>animal</code> branch has the changes that I want.</p>
  <p>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 <code>path not found</code> error.</p>
  <p>What commands do I need to execute to resolve this?</p>