Changes between Version 30 and Version 31 of Help/Concepts/Conflict


Ignore:
Timestamp:
2020-03-10T18:29:19+01:00 (6 years ago)
Author:
stoecker
Comment:

Directory rework, see #18845

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v30 v31  
    19191. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
    20201. 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.
    21 1. You select the menu ''File -> [[Image(source:trunk/images/updatedata.png,middle)]] [wikitr:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [osmwiki:Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
     211. You select the menu ''File -> [[JOSMImage(updatedata,middle)]] [wikitr:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [osmwiki:Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
    2222
    2323JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    … …  
    5151
    5252== See also ==
    53 * [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     53* [[JOSMImage(dialogs/conflict,middle)]] [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
    5454* [wikitr:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5555