Changes between Version 15 and Version 16 of Help/Action/UpdateModified


Ignore:
Timestamp:
2020-05-05T18:47:59+02:00 (2 years ago)
Author:
skyper
Comment:

added one more link; bigger icons

Legend:

Unmodified
Added
Removed
Modified
  • Help/Action/UpdateModified

    v15 v16  
    33= File > Update modified =
    44
    5 [[JOSMImage(updatedata,middle)]]  ''Keyboard shortcut:'' '''{{{Ctrl-Alt-M}}}'''
     5[[JOSMImage(updatedata,link=,48,middle,margin-right=20)]]  ''Keyboard shortcut:'' '''{{{Ctrl+Alt+M}}}'''
    66
    77'''Reload the modified objects in the current data layer from the server.'''
     
    99''This action is disabled unless there are modified objects in the current data layer.''
    1010
    11 You should run '''''File -> Update modified''''' if you want to refresh all modified objects from the server. JOSM won't overwrite the local data, but it may detect, that current object versions from the server collide with your locally modified object versions. In this case, JOSM will create [wikitr:/Help/Concepts/Conflict conflicts]. You will have to resolve them after the update is finished. Your local edits aren't lost.
     11You should run **''File -> Update modified''** if you want to refresh all modified objects from the server. JOSM won't overwrite the local data, but it may detect, that current object versions from the server collide with your locally modified object versions. In this case, JOSM will create [wikitr:/Help/Concepts/Conflict conflicts]. You will have to resolve them after the update is finished. Your local edits aren't lost.
    1212
    1313'''Note''':
    1414 * You can't avoid conflicts by not updating the data! They will just show up at a later time (when uploading).
    1515
     16
    1617== See also ==
    17 
    18  * [[JOSMImage(updatedata,20,middle)]] [wikitr:/Help/Action/UpdateData Update data]
    19  * [[JOSMImage(updatedata,20,middle)]] [wikitr:/Help/Action/UpdateSelection Update selection]
     18 * [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateData Update data]
     19 * [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateSelection Update selection]
     20 * [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict list]
    2021 * [wikitr:/Help/Concepts/Conflict What is a conflict?]
    2122