Changes between Version 32 and Version 33 of Help/Concepts/Conflict

Timestamp:

2023-10-04T11:01:55+02:00 (14 months ago)

Author:

leni

Comment:

update of Conflicts when downloading/updating

Help/Concepts/Conflict

@@ -15 +15 @@
 
 == Conflicts when downloading/updating == #WarningAboutDetectedConflicts
-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. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here's an example:
+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. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here are some examples:
 
+=== Automatic management ===
+1. You have downloaded an area.
+1. You modify the way of a landuse. In the meantime another user downloaded the same zone and deleted 4 nodes from a highway and uploads it.
+1. You select the menu ''File -> [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateData Update data]''. Some nodes no longer exist on the server even though they are still on your layer.
+
+JOSM notifies you by displaying the message:
+ 
+[[Image(conflict-update-data-automatic.png,link=)]]
+
+When you click on **Check on the server**: JOSM can resolve this automatically by deleting nodes on your layer that are no longer on the server and do not collide with your modification.
+JOSM does not create a conflict.
+
+=== Conflict creation ===
 1. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
 1. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
@@ -23 +36 @@
 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
 
-[[Image(conflict-update-data.png,link=)]]
+[[Image(conflict-update-data-detected.png,link=)]]
+
+and creates an unresolved conflict.
+
 
 == Conflict when uploading ==