Changes between Version 24 and Version 25 of Help/Action/UpdateData


Ignore:
Timestamp:
2020-04-19T11:01:57+02:00 (5 years ago)
Author:
leni
Comment:

added wikitr:/

Legend:

Unmodified
Added
Removed
Modified

  • Help/Action/UpdateData

    v24 v25  
    1212Objects, 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.
    1313
    14 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]. 
     14In 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 [wikitr:/Help/Concepts/Conflict conflicts]. 
    1515
    1616You will have to resolve these conflicts manually after the update is finished.
    … …  
    2424
    2525== Stale object in your local dataset == #SyncPotentiallyDeletedObjects
    26 Sometimes another mapper deletes an [wiki:/Help/Concepts/Object object] on the server while it is still present in your local dataset. These objects are called '''stale'''. When you run the update action JOSM checks whether your local dataset may include stale objects and displays the following warning dialog:
     26Sometimes another mapper deletes an [wikitr:/Help/Concepts/Object object] on the server while it is still present in your local dataset. These objects are called '''stale'''. When you run the update action JOSM checks whether your local dataset may include stale objects and displays the following warning dialog:
    2727
    2828[[Image(sync-potentially-deleted-objects.png)]]
    2929
    30 If you click on '''Check on the server''' JOSM checks on the server whether potentially stale objects are really stale, i.e. whether they are deleted on the server. If possible it will purge stale objects automatically from your local dataset. At least, if automatic removal is not possible, it will create [wiki:Help/Concepts/Conflict conflicts] which you can resolve manually.
     30If you click on '''Check on the server''' JOSM checks on the server whether potentially stale objects are really stale, i.e. whether they are deleted on the server. If possible it will purge stale objects automatically from your local dataset. At least, if automatic removal is not possible, it will create [wikitr:/Help/Concepts/Conflict conflicts] which you can resolve manually.
    3131
    3232
    … …  
    3636== See also ==
    3737
    38  * [[JOSMImage(updatedata,20)]] [wiki:Help/Action/UpdateSelection Update selection]
    39  * [[JOSMImage(updatedata,20)]] [wiki:Help/Action/UpdateModified Update modified]
    40  * [wiki:Help/Concepts/Conflict What is a conflict?]
     38 * [[JOSMImage(updatedata,20)]] [wikitr:/Help/Action/UpdateSelection Update selection]
     39 * [[JOSMImage(updatedata,20)]] [wikitr:/Help/Action/UpdateModified Update modified]
     40 * [wikitr:/Help/Concepts/Conflict What is a conflict?]
    4141
    4242----
    43 Back to [wiki:Help/Menu/File Menu File][[Br]]
    44 Back to [wiki:/Help Main Help]
     43Back to [wikitr:/Help/Menu/File Menu File][[Br]]
     44Back to [wikitr:/Help Main Help]