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

Timestamp:

2011-01-02T15:03:33+01:00 (15 years ago)

Author:

stoecker

Comment:

Fix links.

Ru:Help/Concepts/Conflict

@@ -18 +18 @@
  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.
+ 3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[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:[[br]]