From: Douglas Campos <douglas@theros.info>
To: Git Mailing List <git@vger.kernel.org>
Cc: Avery Pennarun <apenwarr@gmail.com>, Bryan Donlan <bdonlan@gmail.com>
Subject: Re: Dividing up a large merge.
Date: Tue, 14 Jul 2009 22:29:03 -0300 [thread overview]
Message-ID: <ed88cb980907141829p44bd616ete74ec02cfad76345@mail.gmail.com> (raw)
In-Reply-To: <20090715011914.GA17100@huya.quicinc.com>
Merging the peer branches before doesn't help it?
On Tue, Jul 14, 2009 at 10:19 PM, <davidb@quicinc.com> wrote:
> 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
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Douglas Campos
Theros Consulting
+55 11 7626 5959
+55 11 3020 8168
next prev parent reply other threads:[~2009-07-15 1:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-14 23:32 Dividing up a large merge davidb
2009-07-15 0:16 ` Bryan Donlan
2009-07-15 0:29 ` davidb
2009-07-15 0:34 ` Avery Pennarun
2009-07-15 1:19 ` davidb
2009-07-15 1:29 ` Douglas Campos [this message]
2009-07-15 1:32 ` Avery Pennarun
2009-07-15 12:28 ` Theodore Tso
2009-07-15 13:39 ` Jakub Narebski
2009-07-15 16:07 ` Theodore Tso
2009-07-15 14:47 ` Larry D'Anna
2009-07-15 18:57 ` Daniel Barkalow
2009-07-15 21:01 ` davidb
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=ed88cb980907141829p44bd616ete74ec02cfad76345@mail.gmail.com \
--to=douglas@theros.info \
--cc=apenwarr@gmail.com \
--cc=bdonlan@gmail.com \
--cc=git@vger.kernel.org \
/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).