Conflict resolution workflow (was Re: Recipes vs. Looms vs. pipelines)

[Martin (gzlist)]

On 18/12/2009, Alexander Belchenko <bialix at ukr.net> wrote:
>
> Maybe `bzr remerge FILE` will help there?

Ha, yes, it probably would have. Bazaar has a lot of features I seldom
need that I forget about when I do want them... I think I'd committed
the merge and uncommitted it which might have complicated things a
little more, but remerge would still have been easier.

Martin