Re: Sharing merge conflict resolution between multiple developers
From: Christian Couder <hidden>
Date: 2016-06-15 23:02:15
Le 11 août 2014 07:50, "Christian Couder" [off-list ref] a écrit :
This should be possible using "git imerge" which is separate tool.
Sorry I sent the above using the gmail app on my mobile phone and unfortunately I can't make it send plain text emails. (Emails which are not plain text are rejected by vger.kernel.org.) Best, Christian.