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

[Jari Aalto]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> 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.

Yes, I think that is how it happened. It's a shivering situation to
not see any *.{BASE,THIS,OTHER} files wonder what happened.

Jari