title: Why is git merging things which I have not modified?
body: <p>I have a problem with a git merge where it is saying there is a conflict between a file change and a rename operation. The branching was done something like this:</p>
  
  <ol>
  <li>base -> more_design</li>
  <li>several changes in more_design</li>
  <li>more_design -> fixed_toolbar</li>
  <li>fixed_toolbar minimal changes (no changes in PNG files)</li>
  <li>modify PNG files in more_design</li>
  <li>rebase more_design to base (no changes in PNG files)</li>
  <li>attempt to merge from fixed_toolbar (git gets confused on PNG files)</li>
  </ol>
  
  <p>A sample of the errors:</p>
  
  <pre><code>Auto-merging ui-app/css/images/icons-retina/item-unselected.png
  CONFLICT (add/add): Merge conflict in ui-app/css/images/icons-retina/item-unselected.png
  CONFLICT (rename/delete): ui-app/css/images/icons-retina/item-selected.png deleted in HEAD and renamed in fixed_toolbar. Version fixed_toolbar of ui-app/css/images/icons-retina/item-selected.png left in tree.
  </code></pre>
  
  <p>And when I try to accept our version it says there is no such version (yet they are definitely there in the branch):</p>
  
  <pre><code>git checkout --ours -- ui-app/css/images/icons-retina/item-*.png
  error: path 'ui-app/css/images/icons-retina/item-unselected.png' does not have our version
  error: path 'ui-app/css/images/icons-retina/item-selected.png' does not have our version
  </code></pre>