Changes between Version 8 and Version 9 of Help/Action/UpdateData

Timestamp:

2009-10-12T13:30:35+02:00 (16 years ago)

Author:

bastiK

Comment:

more verbose

Help/Action/UpdateData

@@ -1 +1 @@
 [[TranslatedPages]]
-== File -> Update Data (Ctrl U) == 
+== File -> Update Data (Ctrl U) ==  
 
-[[Image(updatedata.png)]] ''File->Update data'' reloads all bounding boxes in the current data layer from the server. 
+[[Image(updatedata.png)]] ''File->Update data'' reloads all bounding boxes in the currently active data layer from the server.  
 
-You should run ''File->Update data'' if you want to refresh the data in the current data layer with the data the server currently holds. JOSM won't overwrite local data, but it may detect, that newest object versions from the server collide with objects you are working with locally. In this case, JOSM will create [wiki:/Help/Concepts/Conflict conflicts]. You will have to resolve them after the update is finished. Your local edits aren't lost. 
+(This action is disabled unless the currently active layer is a data layer.)
 
-This action is disabled unless the currently active layer is a data layer.
+You should run ''File->Update data'' if you like to refresh the data in the current data layer with the data the server currently holds. Your local edits will '''not''' be deleted by this update! Here is how it works:  
+
+Objects, you added or edited, will not be affected by the update. If there are new objects on the server (created by other users in the meantime) they will be added to the your layer (and thus merged with your own work). If the server reports objects, that have changed (i. e. a node was removed from a way or a tag was added to an object), these changes will be applied to your local layer, '''unless''' you changed one of these objects as well.
+
+In short: If two users edit one area at the same time, JOSM tries to merge both versions. If this is not possible it will create [wiki:/Help/Concepts/Conflict conflicts].  
+
+You will have to resolve these conflicts manually after the update is finished.
+
+__Example__: Imagine you find a way that looks strange and you add the tag '{{{FIXME=please check this}}}'. But in the meantime someone else spotted the same error, added the tag '{{{FIXME=does this way exist?}}}' and uploaded it. Then you click update to get the latest version from the server.
+In this case JOSM cannot decide which one of the changes to prefer, so it will create a conflict.
+
+Note:
+ * You cannot avoid conflicts by not updating the data! They will just show up at a later time (when uploading).
+ * Updating has the same effect as downloading the area again (''Download as new layer'' unchecked).
 
 == See also ==