Changes between Version 4 and Version 5 of Help/Concepts/Conflict

Timestamp:

2009-10-06T23:02:05+02:00 (16 years ago)

Author:

Gubaer

Comment:

--

Help/Concepts/Conflict

@@ -11 +11 @@
 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:
 
- 1. You've downloaded a node with id 1 from the server whose {{{name}}} tag is set to {{{My name}}}.
- 2. 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.
- 3. You select the menu ''File->[wiki:/wiki/help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag {{{name}}} set to {{{That's the name}}} which collides with {{{Or is it this name?}}}, the name you've been setting.
+ 1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
+ 2. 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.
+ 3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[wiki:/wiki/help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [http://wiki.openstreetmap.org/wiki/Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
 
-JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
+JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:[[br]]
+[[Image(conflict-update-data.png)]]
 
 == Conflict when uploading ==
 If you upload objects to the OSM server, they might "collide" on the server with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object JOSM will sillently skip deleting and it won't bother you with an error messages. In most cases, though, JOSM can deal with them automatically. Here's an example:
 
-  1. You've downloaded a node with id 1 from the server whose {{{name}}} tag is set to {{{My name}}}.
-  2. Another mapper downloads the node with id 1 too, assigns it the name {{{That's the name}}}, and uploads it.
-  3. You change the name to {{{Or is it this name?}}} and upload to the server.
+  1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
+  2. Another mapper downloads the node with id 1 too, assigns it the name `"That's the name"`, and uploads it.
+  3. You change the name to `"{Or is it this name?"` and upload to the server.
   4. On the server, you're upload collides with the upload from the other mapper.