From: Bradley Wagner <bradley.wagner@hannonhill.com>
Date: Thu, 29 Jul 2010 17:57:53 GMT
Subject: Re: What is the scenario for a commit with 3 or more parents
Message-ID: <AANLkTimxcnTkJLqX6qfdYWHrgXOzZ-Rk_48KHyip39ay@mail.gmail.com>
In-Reply-To: <AANLkTik-wOB-iEGK8EnW1Rdk9wwc1E86tYoBU26WepYJ@mail.gmail.com>

On Thu, Jul 29, 2010 at 1:55 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
>
> Heya,
>
> On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce <spearce@spearce.org> wrote:
> > Yes.  Its called an octopus merge.  It happpens sometimes when
> > merging 2 or more otherwise fairly isolated changes in a single
> > shot.  E.g. `git merge feature-a feature-b thing-c`.
>
> Do we have an explanation anywhere as to when one would use a octopus merge?

Another question I had about this: isn't this documentation about
"multi-way merge" inaccurate:
http://book.git-scm.com/5_advanced_branching_and_merging.html.

Sounds like it's not equivalent to merging each branch individually.

>
> --
> Cheers,
>
> Sverre Rabbelier