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


Ignore:
Timestamp:
(multiple changes)
Author:
(multiple changes)
Comment:
(multiple changes)

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v31 v33  
    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'''.
    1515
    1616== Conflicts when downloading/updating == #WarningAboutDetectedConflicts
    17 If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here's an example:
     17If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here are some examples:
    1818
     19=== Automatic management ===
     201. You have downloaded an area.
     211. You modify the way of a landuse. In the meantime another user downloaded the same zone and deleted 4 nodes from a highway and uploads it.
     221. You select the menu ''File -> [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateData Update data]''. Some nodes no longer exist on the server even though they are still on your layer.
     23
     24JOSM notifies you by displaying the message:
     25 
     26[[Image(conflict-update-data-automatic.png,link=)]]
     27
     28When you click on **Check on the server**: JOSM can resolve this automatically by deleting nodes on your layer that are no longer on the server and do not collide with your modification.
     29JOSM does not create a conflict.
     30
     31=== Conflict creation ===
    19321. You've downloaded a node with id:1 from the server whose [osmwiki:Key:name name] tag is set to `"My name"`.
    20331. 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.
     341. 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.
    2235
    2336JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    2437
    25 [[Image(conflict-update-data.png)]]
     38[[Image(conflict-update-data-detected.png,link=)]]
     39
     40and creates an unresolved conflict.
     41
    2642
    2743== Conflict when uploading ==
    … …  
    3551JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
    3652
    37 [[Image(conflict-upload-data.png)]]
     53[[Image(conflict-upload-data.png,link=)]]
    3854
    3955== Conflicts when merging ==
    … …  
    4258
    4359== 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].
     60Each 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].
    4561For each '''conflict''' listed there you can (and should) launch the [wikitr:/Help/Dialog/Conflict Conflict Resolution Dialog] and resolve it.
    4662
    … …  
    5167
    5268== See also ==
    53 * [[JOSMImage(dialogs/conflict,middle)]] [wikitr:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     69* [[JOSMImage(dialogs/conflict)]] [wikitr:/Help/Dialog/ConflictList Conflict List panel] - displays the list of conflicts in the current data layer
    5470* [wikitr:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5571