Why do you need the perfectly reasonable (to me) cherry-pick merge to fail?
(comments also added to the SO question) ----- Original Message ----- From: Elpie Kay To: Git for human beings Sent: Monday, September 19, 2016 5:24 AM Subject: [git-users] How to disable 3way merge for git cherry-pick? 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, 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. -- 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.
