Re: Help breaking up a large merge.

["Santi Béjar" <santi@agolina.net>]

On Thu, Sep 18, 2008 at 5:21 PM, David Brown <git@davidb.org> wrote:
> Say we have a tree that we've been working on for a few months.  An
> outside vendor has also been working on the same tree during this
> time, and we need to merge with their work.
>
> The difficulty I'm having is that there are a lot of conflicts
> resulting from the merge (expected), and it would be nice to somehow
> be able to work on a smaller set of these conflicts at a time.

If the two (or at least one) branches have sufficient isolated commits
you can recreate the merges that could have happened, as is explained
(for monotone) in:

http://www.venge.net/mtn-wiki/ZipperMerge

Another option is to rebase one branch onto the other.

Even another option is to merge the two branches but use the rebased
tree to resolve the conflicts.

They are not for parallel merge resolution, but at least you can do
them incrementally.

HTH,
Santi