Changes between Version 25 and Version 26 of Help/Dialog/Conflict
- Timestamp:
- 2024-09-19T21:54:19+02:00 (16 months ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/Conflict
v25 v26 6 6 **The Conflict Dialog is used to resolve [wikitr:/Help/Concepts/Conflict conflicts] between two [wikitr:/Help/Concepts/Object#Objectversionsandhistory versions] of an OSM object.** 7 7 8 [[Image(conflict-dialog_v19207.png, 900)]]8 [[Image(conflict-dialog_v19207.png,55%)]] 9 9 10 10 The 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: … … 28 28 * 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. 29 29 30 [[Image(conflict-dialog-versions_v19207.png, 900)]]30 [[Image(conflict-dialog-versions_v19207.png,60%,center)]] 31 31 32 32 33 33 == 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)]] 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 properties conflicts. 35 36 Coordinates:: The coordinates of the node. Only relevant for nodes and if the node was moved or deleted. 37 Deleted State:: The state of the object, e.g. if it is still present or if it was deleted. 38 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''. 39 40 As, 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. 41 42 [[Image(propertie-resolve-1_v19207.png,60%,center)]] 39 43 40 44 Select 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. 41 45 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 togreen. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).\\46 [[Image(propertie-resolve-2_v19207.png,60%,center)]] 47 48 The 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)]]).\\ 45 49 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 50 47 [[Image(propertie-resolve-3_v19207.png, 900)]]51 [[Image(propertie-resolve-3_v19207.png,60%,center)]] 48 52 49 53 … … 59 63 **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. 60 64 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)]] 65 === Single tag conflicts === 66 [[Image(one-tag-resolve-1_v19207.png,60%,center)]] 67 68 Select the value you want to keep: \\ 69 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)]]). 70 71 [[Image(one-tag-resolve-2_v19207.png,60%,center)]] 72 73 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. 74 75 [[Image(one-tag-resolve-3-commented_v19207.png,60%,center)]] 76 77 === Multiple tags conflicts === 78 [[Image(tags-resolve-1_v19207.png,60%,center)]] 79 80 Select the values you want to keep: \\ 81 In 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)]]). 82 83 [[Image(tags-resolve-2-commented_v19207.png,60%,center)]] 84 85 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. 86 87 [[Image(tags-resolve-3-commented_v19207.png,60%,center)]] 89 88 90 89 … … 100 99 101 100 * **Screen with nodes** 102 [[Image(node-resolve-main-commented_v19207.png, 900)]]101 [[Image(node-resolve-main-commented_v19207.png,85%,center)]] 103 102 104 103 * **Screen with members** 105 [[Image(member-resolve-main-commented_v19207.png, 900)]]104 [[Image(member-resolve-main-commented_v19207.png,85%,center)]] 106 105 107 106 === The standard workflow === … … 111 110 1. 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. 112 111 1. [[JOSMImage(dialogs/conflict)]] **Apply Resolution** 113 114 112 115 113 Depending on the position of a member/node in the list different background colors are used: … … 126 124 First, select all elements in the leftmost table (either using the mouse or by pressing `Ctrl+A` in the table) (see next screen shot): 127 125 128 [[Image(nodes-simple1-step-1_v19207.png, 900)]]126 [[Image(nodes-simple1-step-1_v19207.png,85%,center)]] 129 127 130 128 Then, 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)]]). 131 129 132 [[Image(nodes-simple1-step-2_v19207.png, 900)]]130 [[Image(nodes-simple1-step-2_v19207.png,85%,center)]] 133 131 134 132 Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list: 135 133 136 [[Image(nodes-simple1-step-3_v19207.png, 900)]]134 [[Image(nodes-simple1-step-3_v19207.png,85%,center)]] 137 135 138 136 The 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. … … 141 139 **Note**: screenshots are for members, but the method is the same for nodes. 142 140 143 ==== =Member/Node selection=====141 ==== Member/Node selection ==== 144 142 Selecting 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. 145 143 146 [[Image(members-complex1-step-1_v19207.png, 900)]]144 [[Image(members-complex1-step-1_v19207.png,85%,center)]] 147 145 148 146 When 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 … … 162 160 * white - a member/node is not selected 163 161 164 [[Image(members-complex1-step-2_v19207.png,90 0)]]165 166 [[Image(members-complex1-step-3_v19207.png,90 0)]]167 168 ==== =Reorder the resulting node/member list if necessary, in "Merged version" =====162 [[Image(members-complex1-step-2_v19207.png,90%,center)]] 163 164 [[Image(members-complex1-step-3_v19207.png,90%,center)]] 165 166 ==== Reorder the resulting node/member list if necessary, in "Merged version" ==== 169 167 When the members/nodes are in the "Merged version" you can move them using the buttons at the bottom of the list 170 168 171 [[Image(members-complex1-step-4_v19207.png,90 0)]]169 [[Image(members-complex1-step-4_v19207.png,90%,center)]] 172 170 173 171 The buttons offer following actions: … … 180 178 Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list: 181 179 182 [[Image(members-complex1-step-5_v19207.png,90 0)]]180 [[Image(members-complex1-step-5_v19207.png,90%,center)]] 183 181 184 182 The 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.
