Thanks for you reply. In that case, 'git cherry-pick B C' and 'git cherry-pick C B' make the file's contents different.
'git cherry-pick B C' is expected, but someone may run 'git cherry-pick C B' by mistake. We want to avoid this mistake. At present it's hard for us to handle this situation through code-review. Grateful for any suggestion to this question or to this situation. 在 2016年9月19日星期一 UTC+8下午4:37:30，Philip Oakley写道： > > 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 <javascript:> > *To:* Git for human beings <javascript:> > *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 > <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+...@googlegroups.com <javascript:>. > 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.
