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


Ignore:
Timestamp:
2020-05-05T19:00:22+02:00 (5 years ago)
Author:
skyper
Comment:

link=; dialog -> panel

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v31 v32  
    1010A '''conflict''' is a difference between two versions of an object which JOSM can't resolve automatically.
    1111
    12 Each data layer maintains a list of unresolved conflicts in the [wikitr:/Help/Dialog/ConflictList Conflict List Dialog]. In this dialog you can launch a [wikitr:/Help/Dialog/Conflict dialog for resolving a conflict].
     12Each data layer maintains a list of unresolved conflicts in the [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel]. In this panel you can launch a [wikitr:/Help/Dialog/Conflict dialog for resolving a conflict].
    1313
    1414'''Resolving a conflict''' means that you have to decide for every difference between the two object versions whether you want to keep the version from the first or the second object, a process which is sometimes also called '''merging'''.
    … …  
    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 -> [[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.
     211. You select the menu ''File -> [[JOSMImage(updatedata)]] [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:
    2424
    25 [[Image(conflict-update-data.png)]]
     25[[Image(conflict-update-data.png,link=)]]
    2626
    2727== Conflict when uploading ==
    … …  
    3535JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    3636
    37 [[Image(conflict-upload-data.png)]]
     37[[Image(conflict-upload-data.png,link=)]]
    3838
    3939== Conflicts when merging ==
    … …  
    4242
    4343== Resolving conflicts ==#Resolvingconflicts
    44 Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [wikitr:/Help/Dialog/ConflictList Conflict List Dialog].
     44Each data layer maintains a list of '''conflicts''' which are not resolved yet. You can consult this list in the [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel].
    4545For each '''conflict''' listed there you can (and should) launch the [wikitr:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it.
    4646
    … …  
    5151
    5252== See also ==
    53 * [[JOSMImage(dialogs/conflict,middle)]] [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     53* [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel] - 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