probably bug? merge A B and merge B A produce different set of conflicts
Aaron Bentley
aaron.bentley at utoronto.ca
Thu Nov 29 13:56:26 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Alexander Belchenko wrote:
> Sometimes bzr merge produce conflicts. Nothing wrong usually.
> Conflicts often unpleasant thing, but most of the time they
> at least understandable.
Could you please post your case.insensitive.wt or a merge directive with
its revisions?
> But this situation is out of my understanding.
My best guess would be poor choice of a least common ancestor, but I
really need the branches in question to know.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHTsUK0F+nu1YWqI0RAmezAJ9yi7m0WTaa2ulRxjO1aRAjre/PHgCfb73x
L+yPbqqfmXRn5YwyFwJiQPU=
=F6K0
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list