200+ conflicts on upload, how to solve them all and not one-by-one ?

Posted by SwissCrusader on 14 January 2020 in English (English)

I need your help, I got stuck with 200+ objects in conflict with my previous upload, for unknown reason. Now I have a large upload I want to send, but JOSM is blocked because of the conflicts. Is there a way to solve them all and tell JOSM "just send my version of everything and overwrite" ? I don't want to lose my mapping but I just can't solve conflicts one by one.

Or is there another solution like deleting the whole zone (let's say a city), upload it as deleted, and re-copy-paste the new data from my faulty OSM file ?

What is the most practical solution to deal with huge amount of conflicts ?

Comment from wangi on 14 January 2020 at 17:15

What is the reason for the conflicts? The two most common are:

  • You have edited / deleted data outside the area you have downloaded (deleted nodes are used by other ways/relations that JOSM doesn't know about until you attempt to upload)
  • Somebody else has changed the same objects

If it is the first then zoom to the area of the conflicted items and make sure you download it. You can multi select items in the conflict list, right click and then resolve to my or their versions.

If it is somebody else's valid, well placed, edits then it would be bad practice to blindly resolve to your own.

Hide this comment

Comment from SwissCrusader on 14 January 2020 at 17:45

I have edited a zone using a save file, and I probably uploaded a changeset without re-saving my save file, then re-opened the old savefile, edited again, and got in conflict with my own data.

When I select multiple Conflicts in my sidebar (Conflicts: 261 unresolved) only one option shows up when I right click: Zoom to conflict. And when I click on Resolve, even if I select all conflicts I can't solve all of them at once. I can select all nodes for each faulty polygon and "Apply resolution", but still, I have to do it 260 more times for the other 260 conflicts.

I could handle it like this but... yeah that's annoying.

I was wondering if someone has a more practical solution when it happens. If no solution, I'll try deleting my city and reupload it all from my savefile.

Hide this comment

Comment from Luciano on 14 January 2020 at 18:27

Savefiles are doom, in JOSM. I know it's supposed to work and be possible, but I gave up years ago. I always confine any JOSM file I intend to upload to a single session.

Perhaps others have better luck.

Frankly, my advice with so many conficts is to give up and start over with a fresh download. If you have a lot of "fresh" work (i.e. version 1 objects) you can cut-and-paste from your old file to your new file. I do this frequently - I will build work in a savefile that I never intend to upload, and when I'm ready to upload, I'll download a fresh snapshot of the area and cut-and-paste my new work to the new, fresh download. This works really well. All of Makaska has been done this way.

Hide this comment

Comment from wangi on 14 January 2020 at 18:31

The "merge down" option in the layers window is good for that too. Assuming it's all new data. L

Hide this comment

Comment from SwissCrusader on 15 January 2020 at 09:24

Ok, so the best option is not re-using JOSM save files after upload, or fresh download each time and do the cut/copy/paste thing from a separate save file.

Thanks for your explanations.

Hide this comment

Leave a comment

Parsed with Markdown

  • Headings

    # Heading
    ## Subheading

  • Unordered list

    * First item
    * Second item

  • Ordered list

    1. First item
    2. Second item

  • Link

  • Image

    ![Alt text](URL)

Login to leave a comment