How do I resolve cherry-pick conflicts using their changes?
First you should undo your cherry-pick, try to run this
git cherry-pick --abort
Second, try to make cherry-pick, but in this time you get their changes not yours, so make this:
git cherry-pick --strategy=recursive -X theirs {Imported_Commit}