From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 15 Jul 2009 00:34:26 GMT
Subject: Re: Dividing up a large merge.
Message-ID: <32541b130907141734o59d224i7e0f39aa8a85e8ef@mail.gmail.com>
In-Reply-To: <20090715002926.GA26630@huya.quicinc.com>

On Tue, Jul 14, 2009 at 8:29 PM, <davidb@quicinc.com> wrote:
> The real issue is that there isn't any single individual who
> understands all of the code that conflicts.  It has to be divided
> up somehow, I'm just trying to figure out a better way of doing
> it.

How about having one person do the merge, then commit it (including
conflict markers), then have other people just make a series of
commits removing the conflict markers?

Avery