How to resolve cherry conflicts using their changes?

Question

My git cherry-pick FOO caused a conflict.

I could look at conflicting files and delete lines between <<<<<<< and ======= , and the conflict markers themselves, but I hope it will be easier there.

I think the svn equivalent was choosing theirs-conflict to solve.

How to do this in git ?

I don't want git checkout --theirs <file> , because it seems to get the same result as git checkout foo <file> instead of just applying git diff FOO~..FOO <file> .

Answer 1

First you must deselect the cherry, try running this

 git cherry-pick --abort 

Secondly, try cherry picking, but at this time you will not get your changes, so do the following:

 git cherry-pick --strategy=recursive -X theirs {Imported_Commit}