Comment 2 for bug 529958

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 529958] [NEW] Don't offer Retry when a merge has conflicts

On Mon, 2010-03-01 at 10:47 +0000, Ian Clatworthy wrote:
> The recently added Retry button when a command fails is nice. The only
> problem is that it gets displayed unexpected now and then, e.g. when a
> merge has conflicts. In this case, I don't expect to see Retry because
> there doesn't seem any reason to try running the command again. If
> that's the case, I think the dialog should just offer Close.
Perhaps it could offer a way to invoke "bzr remerge" with a different
merge algorithm.

Cheers,

Jelmer