[josm-dev] How to resolve conflicts?

[Matthias Julius]

M∡rtin Koppenhoefer <dieterdreist at gmail.com> writes:

> 2010/7/19 Matthias Julius <lists at julius-net.net>:
>> M∡rtin Koppenhoefer <dieterdreist at gmail.com> writes:
>
>> What are you trying to upload?
>
> normal edit, mostly created from scratch.

Re-uploading new objects never creates conflicts.  Only modified
(including deleted) ones do.  It will only create duplicate objects on
the server.

>
>> If you try to upload right after the failed upload you will get
>> conflicts for modified objects because their version number had been
>> incremented on the server during the "failed" upload.
>
> yes, but I also got the error while doing the _first_ upload.

Well, if your data conflicts with the server's data (usually because
someone has uploaded an object you have modified) then there is no way
around resolving those conflicts before the server will accept the data.

>
>> But, if you can verify that your data has been accepted by the server
>> you can throw away your old dataset without trying to upload.
>
> Yes, I'm doing this, but if _some_ data was uploaded and some wasn't,
> this gets painful to detect ( I tend to _believe_ that everything went
> well, when it looks so at first sight).

Normally, uploads are atomic.  Either the server accepts the whole
upload, or not.  It only can get problematic if you did a chunked upload
as mentioned in my other mail.

And if the server has rejected the upload because of a conflict then
none of the data made it into the database and you need to resolve the
conflicts first.

Unfortunately, the server returns an error as soon as it encounters one
conflicting object.  JOSM has no way of knowing whether this was the
only one or whether there are lots more.  Depending on the individual
case the most economic way of resolving those conflicts might be to
select all modified objects and the to "Update selection" and to resolve
any conflicts that come up.

Matthias