Hi All,

Is it possible to disable or not use 3way merge for a cherry-pick, like git 
am or git apply?

I asked a question on Stackoverflow, 
how-to-raise-a-conflict-for-this-git-cherry-pick 
<http://stackoverflow.com/questions/39555056/how-to-raise-a-conflict-for-this-git-cherry-pick>,
 
which describes the case.

Thank you.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to