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

[Wouter van Heyst]

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?

Wouter van Heyst