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

Alexander Belchenko bialix at ukr.net
Fri Dec 18 00:51:45 GMT 2009


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.

Maybe `bzr remerge FILE` will help there?




More information about the bazaar mailing list