From: David Brown <git@davidb.org>
To: "Santi Béjar" <santi@agolina.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Help breaking up a large merge.
Date: Thu, 18 Sep 2008 09:25:07 -0700 [thread overview]
Message-ID: <20080918162507.GA878@linode.davidb.org> (raw)
In-Reply-To: <adf1fd3d0809180855l42af4fb6l67275daef0d2a529@mail.gmail.com>
On Thu, Sep 18, 2008 at 05:55:34PM +0200, Santi Béjar wrote:
>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
next prev parent reply other threads:[~2008-09-18 16:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-18 15:21 Help breaking up a large merge David Brown
2008-09-18 15:55 ` Santi Béjar
2008-09-18 16:25 ` David Brown [this message]
2008-09-18 16:41 ` Johannes Sixt
2008-09-18 17:40 ` Avery Pennarun
2008-09-18 17:47 ` David Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080918162507.GA878@linode.davidb.org \
--to=git@davidb.org \
--cc=git@vger.kernel.org \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).