[josm-dev] how does the transition to tested work ?

[Dirk Stöcker]

On Mon, 8 Mar 2010, Matthias Julius wrote:

>> This is a major issue which I think should be adressed soon. It won't
>> replace the current feature for resolving
>> an individual conflict, but it should complete it with better support
>> for mass resolution.
>
> Since a while I have been thinking adding "Take mine" and "Take theirs"
> to the context menu of the conflict list dialog.  Even quicker would be
> if the conflict list dialog had buttons for this.

Be careful with this. It should only be offered for simple conflicts.

Ciao
-- 
http://www.dstoecker.eu/ (PGP key available)