title: How do I resolve cherry-pick conflicts using their changes?
body: <p>My <code>git cherry-pick FOO</code> produced a conflict.</p>
  
  <p>I could go through the conflicting files and delete the lines between <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> and <code>=======</code>, and the conflict markers themselves, but I'm hoping there's an easier way.</p>
  
  <p>I think the <code>svn</code> equivalent was choosing <code>theirs-conflict</code> to resolve.</p>
  
  <p>How do I do this in <code>git</code>?</p>
  
  <p>I don't want <code>git checkout --theirs &lt;file&gt;</code> as that seems to produce the same result as <code>git checkout foo &lt;file&gt;</code> instead of just getting <code>git diff FOO~..FOO &lt;file&gt;</code> applied.</p>