title: How to resolve "added by us" git cherry-pick conflict?
body: <p>I ran into a problem with git, during a conflict resolution after a cherry-pick. Problem involved modification made on file that was <code>git mv</code> in a previous commit.</p>
  
  <p>Here is an example of the full command to reproduce:</p>
  
  <pre><code>mkdir git_repository &amp;&amp; cd git_repository
  git init
  echo "foo" &gt; myFooFile
  git add myFooFile 
  git commit -m "First commit add myFooFile"
  
  git checkout -b branch-a
  rm myFooFile
  echo "bar" &gt; myBarFile
  git add -A
  git commit -m "rm myFooFile add myBarFile"
  
  git checkout master
  git mv myFooFile myBarFile
  git add -u
  git commit -m "git mv myFooFile myBarFile"
  </code></pre>
  
  <p>Now lets get the modification made on branch-a</p>
  
  <pre><code>git cherry-pick $(git show-ref branch-a)
  &gt;error: could not apply 70c80f3... rm myFooFile add myBarFile
  &gt;hint: after resolving the conflicts, mark the corrected paths
  &gt;hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths&gt;'
  &gt;hint: and commit the result with 'git commit'
  </code></pre>
  
  <p>Here is the conflict:</p>
  
  <pre><code>git status
  &gt;On branch master
  &gt;You are currently cherry-picking commit 70c80f3.
  &gt;  (fix conflicts and run "git cherry-pick --continue")
  &gt;  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  &gt;
  &gt;Unmerged paths:
  &gt;  (use "git add &lt;file&gt;..." to mark resolution)
  &gt;
  &gt;   added by us:     myBarFile
  &gt;
  &gt;no changes added to commit (use "git add" and/or "git commit -a")
  </code></pre>
  
  <p>Unfortunately doing <code>git add myBarFile</code> then <code>git cherry-pick --continue</code> isn't the solution as it creates an empty commit.</p>
  
  <p>Going with <code>git rm myBarFile</code> during resolution is not better as it creates a commit removing foo from myBarFile.</p>
  
  <p>How to properly fix the cherry-pick conflict <strong><em>added by us</em></strong> and end-up in a situation where I got these 3 commits on my master branch ?</p>
  
  <ul>
  <li>rm myFooFile add myBarFile</li>
  <li>git mv myFooFile myBarFile</li>
  <li>First commit add myFooFile</li>
  </ul>
  
  <p>With myBarFile containing bar ?</p>
  
  <p>Note: I known that I could use <code>git checkout branch-a -- myBarFile</code> during git conflict resolution but this not the solution I'm looking for because I don't think it's the git way of doing it.</p>