title: Resolve "CONFLICT (delete/modify)" in git
body: <p>In one branch in one branch A a file is changed and the change commited. Now in another branch B the very same file is edited and renamed.</p>
  
  <p>When merging B into A git recognises the conflict properly (<em>CONFLICT (delete/modify)</em>) and both files are in the working directory.</p>
  
  <p>If I know want to have both changes in one file, how do I do this best?</p>
  
  <p>There is <em>git merge-file</em> that is - if I'm right - expecting both files and a common ancestor. But how to give latter? How can I say "use $path from $commit" or something like that?</p>
  
  <p>Example:</p>
  
  <pre><code>mkdir git-rename-repo
  cd git-rename-repo
  git init
  
  echo "First line" &gt; afile
  
  git add .
  git commit -m "First commit in master"
  git checkout -b mybranch
  
  echo "Second line in mybranch" &gt;&gt; afile
  git mv afile bfile
  
  git commit -a -m "change and rename in mybranch"
  git checkout master
  
  echo "Changed first line in master" &gt; afile
  
  git commit -a -m "changed afile"
  git merge mybranch
  </code></pre>
  
  <p>I now want a file named 'bfile' with both changes:</p>
  
  <p><code>
  Changed first line in master
  Second line in mybranch
  </code></p>
  
  <p>Thanks</p>