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

Re: Help breaking up a large merge.

From
David Brown <git@davidb.org>
Date
Sep 18, 2008, 16:25 UTC
Message-ID
<20080918162507.GA878@linode.davidb.org>
In-Reply-To
<adf1fd3d0809180855l42af4fb6l67275daef0d2a529@mail.gmail.com>
On Thu, Sep 18, 2008 at 05:55:34PM +0200, Santi Béjar wrote:
Show 7 quoted lines
>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.

Either of these is likely to result in more work. Both branches have intermediate results, and there has been some communication between the developers of each branch, so some things are closer at the two tips than they would be at intermediate stages.

I started with this approach, and started realizing that I was resolving similar conflicts repeatedly (not the same, or rerere could have helped).

Basically, I'm looking for a way to break the merge effort up by groups of files/directories.

Thanks, David

Previous: Santi BéjarNext: Johannes Sixt
Message 3 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.