conflicts in the wiki

[leni]

when I read the paragraphs Conflicts when downloading/updating and
Conflict when uploading

I think it's the same description

and the screenshots don't seem to match

I'm not sure that what I wanted to say is understandable; my English must be too weak

[taylor.smock]

I'm making some assumptions here:

• You think that the description is the same and that the screenshots must therefore be the same
  • The primary difference in the description is the action which causes us to know about the conflict. Uploading the data versus downloading data from the server ("updating" existing downloaded data).
• You are reading the "english" version of the wiki

• Download: If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer
• Upload: If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers

The primary difference between the two is the action which causes the conflict. In the first, the action which causes the conflict is an update of the data with new data from the server. In the second, the action which causes the conflict is an upload to the server, whereby the server declines the upload and tells us that there is a conflict.

[leni]

downloading/updating

[leni]

The message may appear in the 1st case,
but if I follow the example I get the message https://josm.openstreetmap.de/attachment/ticket/23190/theFirst.png

In the second case is ok

[taylor.smock]

I think that screenshot may be out of date (it is 14 years old).

[leni]

I update in wiki "Conflicts when downloading/updating"; if my English is too bad it can be changed

[taylor.smock]

Works for me.

Ticket note: change made in wiki:Help/Concepts/Conflict?action=diff&version=33&old_version=32