title: git cherry-pick file conflicts and I would like to use the one in head
body: <p>Current branch, <code>dev</code>, has a <code>HEAD</code> commit <code>Cdev</code>, and I <code>cp(cherry-pick)</code> a commit <code>Cfeature</code> from branch feature:</p>
  <pre><code>git cp Cfeature
  
  Unmerged paths:
    (use &quot;git add &lt;file&gt;...&quot; to mark resolution)
          both modified:   src/afile.txt
  </code></pre>
  <p>I decide to remain src/afile.txt as that in <code>Cdev</code>. I tried
  <code>git restore src/afile.txt</code>, but it failed.</p>