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

[Aaron Bentley]

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

Wouter van Heyst wrote:

> Hmm, I think I've seen such a problem before with multiple conflicts, so
> I don't think it's due to adding and then committing the
> .BASE/.OTHER/.THIS files. You're right that it's not debian/rules
> causing the problem though.

My guess is you pulled, got conflicts in rules, then pulled again, got
conflicts in rules, and as a result, got conflicts in rules.BASE, etc.

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

iD8DBQFFiyFE0F+nu1YWqI0RAmYWAJkB8Gb14zXK+m4SkhQmSvM2RKVW+wCfXpqr
TM5YACcBtO8i8CKfQjmBG0Q=
=KXpq
-----END PGP SIGNATURE-----