Re: Dividing up a large merge.

On Tue, Jul 14, 2009 at 8:29 PM, [off-list ref] 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