star or parallele merge

[David Allouche]

On Wed, 2005-10-05 at 10:21 +0200, Jan Hudec wrote:
> By the way, 3-way merge will produce xbcby or xcbcy depedning on which
> one is selected as a base, which is even worse.

That is what star-merge does. But in practise, it often conflicts in
criss-cross situations (for reasons that are not entirely clear to me).

Smarter merge base selection algorithms properly pick the closest
unambiguous ancestor as merge base and cause a conflict. Aaaron Bentley
designed an algorithm with a tongue twisting name that has this
property.
-- 
                                                            -- ddaa
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051005/4cf1fe75/attachment.pgp