Glenn Morris wrote: > The short answer is that `bzr resolve FILE --take-this' worked, thanks. Well, that was premature. It worked for a simple test repository, but when I tried it on the real thing, bzr (2.2.1 and 2.2.2) crashed. Looks like https://bugs.launchpad.net/bzr/+bug/660935/