0.13: Bzr is frozen. Can't escape from a conflicted state.

[Aaron Bentley]

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

John Arbash Meinel wrote:
> You should be able to:
> 
> bzr resolve rules.BASE
> bzr resolve rules.OTHER
> bzr resolve rules.THIS

Remember also resolve --all.

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

iD8DBQFFiyOZ0F+nu1YWqI0RAkYVAJwKNlG+eO97daU3/LmlZMeIE0lcpwCffUJU
CiVeVRJ6Xf2wElBtnzktggs=
=SSpr
-----END PGP SIGNATURE-----