[josm-dev] How to resolve conflicts?

[Matthias Julius]

Dirk Stöcker <openstreetmap at dstoecker.de> writes:

> 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.

Matthias