[josm-dev] How to resolve conflicts?

[Dirk Stöcker]

On Mon, 19 Jul 2010, Matthias Julius wrote:

>> What to do: When you have this situation that upload may have aborted
>> after the elements got accepted by server:
>>
>> - Download the same area in a new layer.
>> - Check if your changes exist there as well.
>>   Yes: Drop the layer with the original changes.
>>   No:  Upload again, as first upload failed.
>
> Unfortunaltely, this is not so straighforward if you did a chunked
> upload and the upload failed before the last chunk was sent to the
> server.

Correct. Here the "do smaller changesets" catches :-)

I agree this is an issue which must be fixed (like other improvements on 
conflict resolution). We already have most of the stuff which is necessary 
for this. Now only a programmer is missing who puts everything together.

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