From: Bradley Wagner <bradley.wagner@hannonhill.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: What is the scenario for a commit with 3 or more parents
Date: Thu, 29 Jul 2010 13:57:53 -0400 [thread overview]
Message-ID: <AANLkTimxcnTkJLqX6qfdYWHrgXOzZ-Rk_48KHyip39ay@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2010-07-29 17:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 2:05 What is the scenario for a commit with 3 or more parents Bradley Wagner
2010-07-29 2:19 ` Shawn O. Pearce
2010-07-29 17:55 ` Sverre Rabbelier
2010-07-29 17:57 ` Bradley Wagner [this message]
2010-07-29 18:10 ` Joshua Juran
2010-07-29 18:22 ` Sverre Rabbelier
2010-07-29 20:12 ` Junio C Hamano
2010-07-29 20:50 ` Sverre Rabbelier
2010-07-29 21:01 ` Junio C Hamano
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=AANLkTimxcnTkJLqX6qfdYWHrgXOzZ-Rk_48KHyip39ay@mail.gmail.com \
--to=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=srabbelier@gmail.com \
/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).