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


Ignore:
Timestamp:
2009-10-12T21:06:42+02:00 (16 years ago)
Author:
Gubaer
Comment:

minor changes

Legend:

Unmodified
Added
Removed
Modified

  • Help/Action/UpdateData

    v9 v10  
    88You 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: 
    99
    10 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.
     10Objects, 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 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.
    1111
    1212In 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]. 
    … …  
    1515
    1616__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.
    17 In this case JOSM cannot decide which one of the changes to prefer, so it will create a conflict.
     17In this case JOSM cannot decide which of the changes to keep, so it will create a conflict.
    1818
    19 Note:
    20  * You cannot avoid conflicts by not updating the data! They will just show up at a later time (when uploading).
     19'''Note''':
     20 * You can't avoid conflicts by not updating the data! They will just show up at a later time (when uploading).
    2121 * Updating has the same effect as downloading the area again (''Download as new layer'' unchecked).
    2222