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

[Aaron Bentley]

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

Wouter van Heyst wrote:
> On Thu, Dec 21, 2006 at 07:18:19PM -0500, Aaron Bentley wrote:
>> 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.
> 
> This would be a case where auto-resolve (on `bzr resolved`) wouldn't
> help I guess?

Well, you've still got this rules.BASE.moved file hanging around.  Odds
are it's save to delete, and that would be one way of auto-resolving the
conflict, but bzr is kinda rigid about deleting user files.

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

iD8DBQFFiytp0F+nu1YWqI0RAjocAJ9AJeKbovfdiB6i/qEQyGtW9K3jTgCeNRdz
2Ic1cbmwecdhU9ywD6p4C9s=
=cQ3x
-----END PGP SIGNATURE-----