Re: Dividing up a large merge.
Merging the peer branches before doesn't help it?
On Tue, Jul 14, 2009 at 10:19 PM, <davidb@quicinc.com> wrote:
Show 18 quoted lines
> 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
Douglas Campos <douglas@theros.info>