[josm-dev] How to resolve conflicts?

[Matthias Julius]

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

> JOSM never had a detection to find that new elements in editor are
> equal to elements on the database. As soon as upload went well for the
> server, but josm doen't get informed about there is a problem.
>
> We don't have a "match new stuff to server stuff and drop it when
> equal". This would be required to fix this issue.

Actually, JOSM does something like this when merging new objects (id <
0) into another dataset.  So, to get JOSM to map new objects to
objects downloaded from API after there have been more modifications
to the dataset it might work to :

 - download the area into a new layer
 - merge the old layer into the new one

On the next upload you will get conflicts for objects that have been
deleted in the local data because JOSM tries to delete them again on
the server.

There might be other pitfalls.

Matthias