On Tue, Oct 02, 2007 at 08:56:18PM +0000, martin f krafft wrote: > also sprach Pierre Habouzit <madcoder@xxxxxxxxxx> [2007.10.02.2147 +0100]: > > (a*) > > / \ > > (ab*) (ac*) > > \ / > > ???? > > (a*, ab*, ac*) Definitely not. a* -> ab* is making a?* unignored for any value of ? except b. So adding a* is definitely invalid. So your final merge is definitely invalid. I'd say that it's likely that the final merge is (ab*, ac*) but on the left branch the ab* could have been chosen because the programmer added a thing named ac.c, so the merge would still have (probably little but still some) chances to be invalid. -- ·O· Pierre Habouzit ··O madcoder@xxxxxxxxxx OOO http://www.madism.org
Attachment:
pgpCJeSfNCDEe.pgp
Description: PGP signature
