[josm-dev] How to resolve conflicts?

[M∡rtin Koppenhoefer]

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.


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


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

Cheers,
Martin