Re: Dividing up a large merge.

On Tue, Jul 14, 2009 at 05:34:26PM -0700, Avery Pennarun wrote:

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?

I guess this helps in some sense, but the intermediate result
isn't going to build, and things like mergetool aren't going to
work.  It's helpful for the individuals to have the full merge
conflict available, or at least the stages of the files in
question.

David