Changes between Version 25 and Version 31 of Help/Dialog/Conflict


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

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v25 v31  
    66**The Conflict Dialog is used to resolve [wikitr:/Help/Concepts/Conflict conflicts] between two [wikitr:/Help/Concepts/Object#Objectversionsandhistory versions] of an OSM object.**
    77
    8 [[Image(conflict-dialog_v19207.png,900)]]
     8[[Image(conflict-dialog_v19207.png,55%)]]
    99
    1010The dialog has four tabs but depending on the [wikitr:/Help/Concepts/Object#NodesWaysRelations object type] only some are active, though, the ''Properties'' and the ''Tags'' tab are always active. The tabs from left to right are:
    1111
    12  [#ResolvingConflictsProperties Properties]:: Conflicts in main properties of the object
     12 [#ResolvingConflictsProperties Properties]:: Basic information of the object and conflicts in main properties of the object
    1313 [#Resolvingdifferencesbetweentags Tags]:: Conflicts in [wikitr:/Help/Concepts/Object#Tags1 tags]
    1414 [#ResolvingConflictsNodeMemberList Nodes]:: Conflicts in the node list (only relevant for [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways])
    … …  
    2828 * In case of a conflict between the [wikitr:/Help/Dialog/RelationEditor Relation Editor] and the data layer this is the version of the relation editor.
    2929
    30 [[Image(conflict-dialog-versions_v19207.png,900)]]
     30[[Image(conflict-dialog-versions_v19207.png,60%,center)]]
    3131
    3232
    3333== Resolving differences between properties ==#ResolvingConflictsProperties
    34 If the properties (`Coordinates` or `Deleted State`) of one version of an object are different from the properties of another version, the Conflict dialog shows a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in the tab **''Properties''**. Click on the tab to display a dialog for resolving propertie conflicts.
    35 
    36 In the example below "`Coordinates`" and "`Deleted State`" values in the two object versions are different, though, and JOSM therefore displays the row with a red background. In the first version the object is "`not deleted`", the opposite version is "`deleted`". You now have to decide which of these values you want to keep and which you want to discard.
    37 
    38 [[Image(propertie-resolve-1_v19207.png,900)]]
     34If the properties (`Coordinates` or `Deleted State`) of one version of an object are different from the properties of another version, the Conflict dialog shows a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in the tab **''Properties''**. Click on the tab to display a dialog for resolving properties conflicts.
     35
     36The first three rows display basic information of the object, for ''My version'' and for ''Their version'', similar to the [[JOSMImage(dialogs/history)]] [wikitr:/Help/Action/ObjectHistory History Dialog], see [wikitr:/Help/Action/ObjectHistory#Basicinformationaboutaversion Basic information about version].
     37
     38 Coordinates:: The coordinates of the node. Only relevant for nodes and if the node was moved or deleted.
     39 Deleted State:: The state of the object, e.g. if it is still present or if it was deleted.
     40 Referenced by:: List of parents, e.g. ways with the node in their node list or relations which the object is a member of. ''This row just displays information''.
     41
     42As, in the example below, the values for "`Coordinates`" and "`Deleted State`" of the two object versions are different and the rows have a red background. On the left side the object has coordinates and is present (e.g. **`not deleted`**) while on the right side the object is **`deleted`** and therefore has no coordinates. You now have to decide which of these values you want to keep and which you want to discard.
     43
     44[[Image(propertie-resolve-1_v19207.png,60%,center)]]
    3945
    4046Select the values you want to keep, in the example for instance the value on the left. If you click on one of the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the values and to discard the opposite values.
    4147
    42 [[Image(propertie-resolve-2_v19207.png,900)]]
    43 
    44 The table in the middle now displays the values to keep and the background color turns to green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).\\
    45 Once all tag conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
    46 
    47 [[Image(propertie-resolve-3_v19207.png,900)]]
     48[[Image(propertie-resolve-2_v19207.png,60%,center)]]
     49
     50The table in the middle now displays the values to keep and the background color turns green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).\\
     51Once all property conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
     52
     53[[Image(propertie-resolve-3_v19207.png,60%,center)]]
    4854
    4955
    … …  
    5965**Note**: To quickly solve single tag conflicts, the tags in the first tag of both outside tables are by default selected and therefore their background is blue and only the middle table has a red background.
    6066
    61 * **single tag conflicts**
    62 
    63 [[Image(one-tag-resolve-1_v19207.png,900)]]
    64 
    65 * **multiple tags conflicts**
    66 
    67 [[Image(tags-resolve-1_v19207.png,900)]]
    68 
    69 Select the values you want to keep :
    70 * **single tag conflicts**
    71 in the example for instance the value on the left. If you either double-click on the value or click on one of the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the value and to discard the opposite value. The table in the middle now displays the value to keep and the background color turns to green. Selected value in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
    72 
    73 [[Image(one-tag-resolve-2_v19207.png,900​)]]
    74 
    75 * **multiple tags conflicts**
    76 In the example: If you double-click on a value, or you select more values by pressing click `+Ctrl` or click `+shift` and then click on the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the values and discard the opposite values. The table in the middle now displays the values to keep and the background color turns to green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
    77 
    78 [[Image(tags-resolve-2-commented_v19207.png,900)]]
    79 
    80 Once all tag conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs, the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled and you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
    81 
    82 * **single tag conflicts**
    83 
    84 [[Image(one-tag-resolve-3-commented_v19207.png,900)]]
    85 
    86 * **multiple tags conflicts**
    87 
    88 [[Image(tags-resolve-3-commented_v19207.png,900)]]
     67=== Single tag conflicts ===
     68[[Image(one-tag-resolve-1_v19207.png,60%,center)]]
     69
     70Select the value you want to keep: \\
     71In the example for instance the value on the left. If you either double-click on the value or click on one of the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the value and to discard the opposite value. The table in the middle now displays the value to keep and the background color turns to green. Selected value in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
     72
     73[[Image(one-tag-resolve-2_v19207.png,60%,center​)]]
     74
     75Once all tag conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs, the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled and you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
     76
     77[[Image(one-tag-resolve-3-commented_v19207.png,60%,center)]]
     78
     79=== Multiple tags conflicts ===
     80[[Image(tags-resolve-1_v19207.png,60%,center)]]
     81
     82Select the values you want to keep: \\
     83In the example: If you double-click on a value, or you select more values by holding `Ctrl` or `Shift` and then click on the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the values and discard the opposite values. The table in the middle now displays the values to keep and the background color turns to green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
     84
     85[[Image(tags-resolve-2-commented_v19207.png,60%,center)]]
     86
     87Once all tag conflicts are solved the green check mark ([[JOSMImage(misc/green_check,link=,top)]]) is displayed in front of the name of the tab and if there are no further conflicts in other tabs, the button [[JOSMImage(dialogs/conflict)]] **Apply Resolution** is enabled and you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
     88
     89[[Image(tags-resolve-3-commented_v19207.png,60%,center)]]
    8990
    9091
    … …  
    100101
    101102* **Screen with nodes**
    102 [[Image(node-resolve-main-commented_v19207.png,900)]]
     103[[Image(node-resolve-main-commented_v19207.png,85%,center)]]
    103104
    104105* **Screen with members**
    105 [[Image(member-resolve-main-commented_v19207.png,900)]]
     106[[Image(member-resolve-main-commented_v19207.png,85%,center)]]
    106107
    107108=== The standard workflow ===
    … …  
    1111121. Freeze the resulting merged node/member list by clicking on the **Freeze** button ([[Image(button-freeze.png,link=,middle)]]). When you freeze the merged node/member list you tell JOSM that all conflicts in the node/member list are resolved.
    1121131. [[JOSMImage(dialogs/conflict)]] **Apply Resolution**
    113 
    114114
    115115Depending on the position of a member/node in the list different background colors are used:
    … …  
    126126First, select all elements in the leftmost table (either using the mouse or by pressing `Ctrl+A` in the table) (see next screen shot):
    127127
    128 [[Image(nodes-simple1-step-1_v19207.png,900)]]
     128[[Image(nodes-simple1-step-1_v19207.png,85%,center)]]
    129129
    130130Then, click on the top button right of the table ([[JOSMImage(dialogs/conflict/copystartleft)]]) to copy the selected nodes/members to the middle table with the merged nodes/members; You can reach the same result without selecting the nodes/members by clicking on the button on the back button right of the table ([[JOSMImage(dialogs/conflict/useallleft)]]).
    131131
    132 [[Image(nodes-simple1-step-2_v19207.png,900)]]
     132[[Image(nodes-simple1-step-2_v19207.png,85%,center)]]
    133133
    134134Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list:
    135135
    136 [[Image(nodes-simple1-step-3_v19207.png,900)]]
     136[[Image(nodes-simple1-step-3_v19207.png,85%,center)]]
    137137
    138138The symbol in the nodes/members tab now switched to a green check mark ([[JOSMImage(misc/green_check,middle,link=)]]) and you can apply the merge decisions.
    … …  
    141141**Note**: screenshots are for members, but the method is the same for nodes.
    142142
    143 ===== Member/Node selection =====
     143==== Member/Node selection ====
    144144Selecting members/nodes in the list ("My version" and "Their version") works as usual: `Shift+`click to select a range of members/nodes, hold `Ctrl+`click to select and unselect multiple members/nodes.
    145145
    146 [[Image(members-complex1-step-1_v19207.png,900)]]
     146[[Image(members-complex1-step-1_v19207.png,85%,center)]]
    147147
    148148When members/nodes are selected use the buttons to the right of the ‘My version’ list and to the left of the ‘Their version’ list to put them in the ‘Merged version’ list. The buttons on the two lists are symmetrical
    … …  
    162162* white - a member/node is not selected
    163163
    164 [[Image(members-complex1-step-2_v19207.png,900)]]
    165 
    166 [[Image(members-complex1-step-3_v19207.png,900)]]
    167 
    168 ===== Reorder the resulting node/member list if necessary, in "Merged version" =====
     164[[Image(members-complex1-step-2_v19207.png,90%,center)]]
     165
     166[[Image(members-complex1-step-3_v19207.png,90%,center)]]
     167
     168==== Reorder the resulting node/member list if necessary, in "Merged version" ====
    169169When the members/nodes are in the "Merged version" you can move them using the buttons at the bottom of the list
    170170
    171 [[Image(members-complex1-step-4_v19207.png,900)]]
     171[[Image(members-complex1-step-4_v19207.png,90%,center)]]
    172172
    173173The buttons offer following actions:
    … …  
    180180Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list:
    181181
    182 [[Image(members-complex1-step-5_v19207.png,900)]]
     182[[Image(members-complex1-step-5_v19207.png,90%,center)]]
    183183
    184184The symbol in the nodes/members tab now switched to a green check mark ([[JOSMImage(misc/green_check,middle,link=)]]) and you can apply the merge decisions.