Bazaar

  1. Bug #4700
  2. Comment #1

Comment 1 for bug 4700

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 4700] Merge conflict: "2 conflicts encountered" but no "bzr conflicts" output

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Brad Bollenbach wrote:
| I'm guessing then that the conflicts and the WARNINGs are related, but
| this is confusing.

There were no textual conflicts, just tree-shape conflicts, which are
reported as WARNINGs, like other conflicts. The conflicts were: merge
wanted to remove two directories, but your working copy had files that
it didn't expect to find there. These conflicts were handled by merely
unversioning the directories, instead of deleting them as usual.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDgk5C0F+nu1YWqI0RAm4BAJ0fA1FjIsuwzIc2HMs0YyMOdGov+wCdH7Zk
g7gNsAPA5u2pkDTYsRrNa58=
=TTkm
-----END PGP SIGNATURE-----