title: cherry-picking with git with a conflict
body: <p>I have two branches Z with some changed and M with some conflicting changes. I'd like to merge the first change on Z into M. When I try to see which changes are still out there.
  (There are actually a few more changes but this already shows the problem)</p>
  
  <pre><code>$ git checkout M
  $ git cherry M Z
  + 153c2f840f2192382be1fc435ceb069f0814d7ff
  + 4a7979d5dd526245b51769db21acf4c286825036
  
  $ git cherry-pick 153c2f840f2192382be1fc435ceb069f0814d7ff
  error: could not apply 153c2f8... add Z
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths&gt;'
  hint: and commit the result with 'git commit'
  • (M|CHERRY-PICKING) $ git st
  # On branch M
  # Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both modified:      README.txt
  #
  no changes added to commit (use "git add" and/or "git commit -a")
  • (M|CHERRY-PICKING) $ vim README.txt 
  </code></pre>
  
  <p>I fixed the conflict here</p>
  
  <pre><code>• (M|CHERRY-PICKING) $ git add README.txt
  • (M|CHERRY-PICKING) $ git ci -m'cherry picked'
    [M dc5de35] cherry picked
    1 file changed, 1 insertion(+), 1 deletion(-)
  • (M) $ git cherry M Z
  + 153c2f840f2192382be1fc435ceb069f0814d7ff
  + 4a7979d5dd526245b51769db21acf4c286825036
  </code></pre>
  
  <p>So after I committed the change it still thinks that neither changes were cherry-picked
  I was expecting:</p>
  
  <pre><code>- 153c2f840f2192382be1fc435ceb069f0814d7ff
  + 4a7979d5dd526245b51769db21acf4c286825036
  </code></pre>
  
  <p>How am I going to know a week from now that I already merged 153c2f ?
  How can I do the cherry-picking in a way that it will know about that merge?</p>