Re: Octopus merge: unique (?) to git, but is it useful?

Jakub Narebski [off-list ref] writes:

On Tue, 3 June 2008, Matthieu Moy wrote:

quoted

Jakub Narebski [off-list ref] writes:

quoted

I think that octopus merge (merge with more than two parents/legs) is 
feature which is unique to git (isn't it?).  

bzr can do similar things:

bzr merge some-branch
bzr merge --force some-other-branch
bzr commit

Since bzr doesn't auto-commit after a merge, the above commands
actually creates only one revision with 3 parents (the --force is here
to let merge do it's job with uncommited changes in the tree).

But does it store octopus merge as octopus: commit with more than
two parents?

Yes, it's actually a single commit object with 3 parents.

-- 
Matthieu