git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Help breaking up a large merge.

From
SBSanti Béjar <santi@agolina.net>
Date
Sep 18, 2008, 15:55 UTC
Message-ID
<adf1fd3d0809180855l42af4fb6l67275daef0d2a529@mail.gmail.com>
In-Reply-To
<20080918152154.GA27019@linode.davidb.org>
On Thu, Sep 18, 2008 at 5:21 PM, David Brown <git@davidb.org> wrote:
Show 7 quoted lines
> 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

Previous: David BrownNext: David Brown
Message 2 of 6 in “Help breaking up a large merge.”
  1. David BrownSep 18, 2008
  2. Santi BéjarSep 18, 2008
  3. David BrownSep 18, 2008
  4. Johannes SixtSep 18, 2008
  5. Avery PennarunSep 18, 2008
  6. David BrownSep 18, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.