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

[Martin (gzlist)]

On 17/12/2009, Barry Warsaw <barry at canonical.com> wrote:
>
> ... It's entirely possible that I didn't resolve the
> conflict correctly the first time.
>
> Does bzr have tools to help me with this?

I did just this the other day, realised after resolving all the
conflicts in a complicated merge that I'd made a mistake in one file.
The easiest way I could think of fixing without redoing from scratch
was to make a new branch from the last revision, run the same merge,
and copy the conflicts bits for that file across to look at them
again. A better way of handling such opses would be nice.

Martin