Changes between Version 6 and Version 7 of Help/Concepts/Conflict

Timestamp:

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

Author:

Gubaer

Comment:

--

Help/Concepts/Conflict

@@ -19 +19 @@
 
 == 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:
+If you upload objects to the OSM server, they might "collide" there 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 won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
 
   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.
+  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.
 
 JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
-[[br]]
+[[BR]]
 [[Image(conflict-upload-data.png)]]
+[[BR]]