In the meantime, can I get the desired result by doing:
bzr revert src/unexalpha.c.OTHER rm src/unexalpha.c.BASE bzr resolve src/unexalpha.c
? It seems to produce the right end state, but I'd like to check before I start using it...
In the meantime, can I get the desired result by doing:
bzr revert src/unexalpha. c.OTHER c.BASE
rm src/unexalpha.
bzr resolve src/unexalpha.c
? It seems to produce the right end state, but I'd like to check before I start using it...