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

On Jul 29, 2010, at 10:55 AM, Sverre Rabbelier wrote:

Heya,

On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce [off-list ref] wrote:

quoted

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?

How about if you had two (or more) components with a shared protocol, and you updated each to speak a new (and incompatible) protocol.  The changes to each component might be done in separate topic branches, but you'd want to merge them all at once.

$ git checkout master
$ git merge client-v2 server-v2

Josh