git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What is the scenario for a commit with 3 or more parents

From
Bradley Wagner <bradley.wagner@hannonhill.com>
Date
Jul 29, 2010, 17:57 UTC
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:
Show 9 quoted lines
>
> 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.
Show 5 quoted lines
>
> --
> Cheers,
>
> Sverre Rabbelier
Previous: Sverre RabbelierNext: Joshua Juran
Message 4 of 9 in “What is the scenario for a commit with 3 or more parents”
  1. Bradley WagnerJul 29, 2010
  2. Shawn O. PearceJul 29, 2010
  3. Sverre RabbelierJul 29, 2010
  4. Bradley WagnerJul 29, 2010
  5. Joshua JuranJul 29, 2010
  6. Sverre RabbelierJul 29, 2010
  7. Junio C HamanoJul 29, 2010
  8. Sverre RabbelierJul 29, 2010
  9. Junio C HamanoJul 29, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.