Re: What is the scenario for a commit with 3 or more parents
flat view
From: Bradley Wagner <hidden>
Date: 2016-06-15 22:49:13
On Thu, Jul 29, 2010 at 1:55 PM, Sverre Rabbelier [off-list ref] 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?
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