title: git - Same file added by both branches causes weird merge conflict
body: <p>I currently have two branches I am working on. Because of a software update I had to completly change the folder structre. Therefore I moves the files in both branches. Now I reached a point where I want to merge my working branch into my master branch.</p>
  
  <p>The problem is that there are merge conflicts that tell me that a file was added by only one branch (<code>added by them</code> or <code>added by us</code>). The problem is that the file has been added by <strong>both</strong> branches.</p>
  
  <p>For example I have a texture at <code>textures/texture1.png</code>. The master branch just moved it to the right location (was before <code>misc/textures/texture1.png</code>). The working branch moved it to the exact same location and edited it afterwards. The merge conflict for this file says:</p>
  
  <pre><code>    added by us: textures/texture1.png
  </code></pre>
  
  <p>The point is that this is <strong>not</strong> the file I want! I want the file from the other branch!<br>
  When I do </p>
  
  <pre><code>git checkout --theirs textures/texture1.png
  </code></pre>
  
  <p>I get</p>
  
  <pre><code>error: path 'textures/texture1.png' does not have their veresion
  </code></pre>
  
  <p>But this file <strong>does</strong> exist! I added it recently! And that's the file I want</p>
  
  <p>How do I resolve these conflicts?</p>
  
  <p><em>(more information if needed!)</em></p>