|
I had problems with conflicts that kept practically never ended. I spent so much time resolving them and then deleting the all the resolved ones that were created out of the blue and I fixed all the problems. I uploaded it and it asked me to synchronize ONE node and I did that and it "uploaded" and I apparently clicked update data thinking it would take the data I just uploaded to make sure I'm on the latest version and instead it downloaded the latest "old" data creating tons conflicts. It never uploaded. I also saved it but it didn't save anything I did in the changeset. Did it ever upload? |
|
I have lost many hours of work trying to resolve conflicts also. The Conflict Resolution dialong box is not particularly user-friendly in IMO. For one, thing when it presents you with two versions to synchronize, "your version" and "their version", it fails to tell you who the other party is. I'm pretty sure I've compared two of my own versions of the data in some cases, but I am not sure of that. It is a painful process though. The best way to prevent conflicts is to upload your changes frequently, especially if you're working in an area where other mappers are active. Many of my changesets are situated in rural Alaska where few other mappers are working so I can afford to wait quite a while before uploading. Hope this helps |
|
Another way to see your changesets is to use WhoDidIt and zoom to the area where you edited: |
|
Hi, You can see all your own changesets here :- https://www.openstreetmap.org/user/Mxdanger/history#map=2/7.2/-25.8 You can then click on one and see exactly what was modified/added in the changeset, nodes, ways ect. Regards & Good Luck! |
just a sidenote (not helpful afterwards): JOSM can save locally. So if you do not want to upload yet, you can save locally into a file. If you would mess up something in a possible conflict resolution afterwards, you always can go back a step and load the file.
In addition, if you are editing in an area where other users also do many edits and conflicts are expected, then it would be a good idea to keep the changesets smaller and upload often - reducing the chance of many conflicts.
Just another sidenote about JOSM conflicts - I've seen a case where splitting a way while the relation dialog is open causes a conflict with yourself that is nearly impossible to resolve.