On Thu, Jul 29, 2010 at 1:55 PM, Sverre Rabbelier <srabbelier@xxxxxxxxx> wrote: > > Heya, > > On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce <spearce@xxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html