From: Nico Williams <nico@cryptonector.com>
Date: Mon, 11 Aug 2014 19:33:47 GMT
Subject: Re: Sharing merge conflict resolution between multiple developers
Message-ID: <CAK3OfOhASo7O8UY0xbRti1GCaaLe8nZTsNj5tBQpGYNwO77R5g@mail.gmail.com>
In-Reply-To: <CAFOYHZCiKC4TR4jFVUB=W5qbDG8XvB2Obx1ZfTH8OF3E_c5BnA@mail.gmail.com>

IIUC, this might help,

http://www.mail-archive.com/git@vger.kernel.org/msg56418.html
http://www.mail-archive.com/git@vger.kernel.org/msg56468.html