| 29 | | 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 the window for resolving property conflicts. |
| 30 | | |
| 31 | | 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. |
| 32 | | |
| 33 | | [[Image(propertie-resolve-1_v19207.png)]] |
| | 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 | The 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 | |
| | 42 | 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. |
| | 43 | |
| | 44 | [[Image(propertie-resolve-1_v19207.png,60%,center)]] |
| 37 | | [[Image(propertie-resolve-2_v19207.png)]] |
| 38 | | |
| 39 | | 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)]]).\\ |
| 40 | | 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. |
| 41 | | |
| 42 | | [[Image(propertie-resolve-3_v19207.png)]] |
| | 48 | [[Image(propertie-resolve-2_v19207.png,60%,center)]] |
| | 49 | |
| | 50 | 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)]]).\\ |
| | 51 | Once 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)]] |
| | 54 | |
| 55 | | [[Image(tag-resolve-1-commented.png)]] |
| 56 | | |
| 57 | | Select the values you want to keep, 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 values and to 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)]]). |
| 58 | | |
| 59 | | [[Image(tag-resolve-2-commented.png)]] |
| 60 | | |
| 61 | | 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. |
| 62 | | |
| 63 | | [[Image(tag-resolve-3-commented.png)]] |
| 64 | | |
| 65 | | == Resolving differences in the node/member list of two versions of a way/relation ==#ResolvingConflictsNodeMemberList |
| 66 | | If you see a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,top,link=)]]) in the tab **''Nodes''** respectively **''Members''** then you have to resolve differences in the list of [[JOSMImage(data/node,top,link=)]] [wikitr:/Help/Concepts/Object#Nodes nodes] of two [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways] respectively the list of members of two [[JOSMImage(data/relation)]] [wikitr:/Help/Concepts/Object#Relations relations]. There are three columns of tables in the respective panel (see screen shot below): |
| 67 | | * the leftmost table displays the list of nodes/members of the the local object version |
| 68 | | * the rightmost table displays the list of nodes/members of the the server object version |
| 69 | | * the table in the middle shows the list of nodes/members of the merged way/relation |
| | 67 | === Single tag conflicts === |
| | 68 | [[Image(one-tag-resolve-1_v19207.png,60%,center)]] |
| | 69 | |
| | 70 | Select the value you want to keep: \\ |
| | 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,60%,center)]] |
| | 74 | |
| | 75 | 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. |
| | 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 | |
| | 82 | Select the values you want to keep: \\ |
| | 83 | 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)]]). |
| | 84 | |
| | 85 | [[Image(tags-resolve-2-commented_v19207.png,60%,center)]] |
| | 86 | |
| | 87 | 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. |
| | 88 | |
| | 89 | [[Image(tags-resolve-3-commented_v19207.png,60%,center)]] |
| | 90 | |
| | 91 | |
| | 92 | == Resolving differences in the node/member list of two versions of a way/relation == |
| | 93 | Resolution methods are similar for both nodes and members. |
| | 94 | |
| | 95 | If you see a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,top,link=)]]) in the tab ''**Nodes** respectively **Members**'' then you have to resolve differences in the list of [[JOSMImage(data/node,top,link=)]] [wikitr:/Help/Concepts/Object#Nodes nodes] of two [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways] respectively the list of members of two [[JOSMImage(data/relation)]] [wikitr:/Help/Concepts/Object#relations relations]. There are three columns of tables in the respective panel (see screen shot below): |
| | 96 | * the leftmost table displays the list of nodes/members of the local object version |
| | 97 | * the rightmost table displays the list of nodes/members of the server object version |
| | 98 | * the table in the middle shows the list of nodes/member of the merged way |
| 82 | | === A simple workflow: Keep the node list from your local object version === |
| 83 | | The following example shows the workflow when you decide to keep all nodes in the same order from your local object version. \\ |
| 84 | | ''(Example is out of date (new buttons), but still works.)'' |
| | 115 | Depending on the position of a member/node in the list different background colors are used: |
| | 116 | * [[Image(compare-in-one-list-only.png,link=,middle)]] - red - the member/node is in this list **only**. It isn't present in the opposite list. |
| | 117 | * [[Image(compare-different-positions.png,link=,middle)]] - yellow - the member/node is in both lists, but it is on different positions |
| | 118 | * [[Image(compare-in-both-lists.png,link=,middle)]] - green - a member/node is in both lists at the same position |
| | 119 | * [[Image(selected.png,link=,middle)]] - blue - a member/node is selected |
| | 120 | * [[Image(not-selected.png,link=,middle)]] - white - in the list (Merged version) a member/node is not selected |
| | 121 | |
| | 122 | === A simple workflow: Keep the node/member list from your local object version === |
| | 123 | The following example shows the workflow when you decide to keep all nodes/members in the same order from your local object version. \\ |
| | 124 | **Note**: screenshots are for nodes, but the method is the same for members. |
| 88 | | [[Image(simple1-step-1.png)]] |
| 89 | | |
| 90 | | Then, click on the top button right of the table ([[JOSMImage(dialogs/conflict/copystartleft)]]) to copy the selected nodes to the middle table with the merged nodes: |
| 91 | | |
| 92 | | [[Image(simple1-step-2.png)]] |
| 93 | | |
| 94 | | Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node list: |
| 95 | | |
| 96 | | [[Image(simple1-step-3.png)]] |
| 97 | | |
| 98 | | The symbol in the nodes tab now switched to a green check mark ([[JOSMImage(misc/green_check,middle,link=)]]) and you can apply the merge decisions. |
| | 128 | [[Image(nodes-simple1-step-1_v19207.png,85%,center)]] |
| | 129 | |
| | 130 | 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 | |
| | 132 | [[Image(nodes-simple1-step-2_v19207.png,85%,center)]] |
| | 133 | |
| | 134 | Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list: |
| | 135 | |
| | 136 | [[Image(nodes-simple1-step-3_v19207.png,85%,center)]] |
| | 137 | |
| | 138 | 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. |
| | 139 | |
| | 140 | === A less simple workflow: Mix and Reorganise the list of nodes/members of the local version of the object and their version === |
| | 141 | **Note**: screenshots are for members, but the method is the same for nodes. |
| | 142 | |
| | 143 | ==== Member/Node selection ==== |
| | 144 | 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 | |
| | 146 | [[Image(members-complex1-step-1_v19207.png,85%,center)]] |
| | 147 | |
| | 148 | 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 |
| | 149 | |
| | 150 | The buttons offer following actions: |
| | 151 | |
| | 152 | ||= **Icon** =||= **Description** =|| |
| | 153 | || [[JOSMImage(dialogs/conflict/copystartleft)]] || Copy "my" selected elements to the start of the merged member/node list || |
| | 154 | || [[JOSMImage(dialogs/conflict/copybeforecurrentleft)]] || Copy "my" selected elements before the first selected elements in the merged member/node list || |
| | 155 | || [[JOSMImage(dialogs/conflict/copyaftercurrentleft)]] || Copy "my" selected elements after the first selected elements in the merged member/node list || |
| | 156 | || [[JOSMImage(dialogs/conflict/copyendleft)]] || Copy "my" selected elements to the end of the list of merged elements || |
| | 157 | |||| |
| | 158 | || [[JOSMImage(dialogs/conflict/useallleft)]] || Copy all "my" selected elements to the target || |
| | 159 | |
| | 160 | Depending on the position of a member/node in the list "Merged version" different background colors are used: |
| | 161 | * blue - a member/node is selected |
| | 162 | * white - a member/node is not selected |
| | 163 | |
| | 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" ==== |
| | 169 | When the members/nodes are in the "Merged version" you can move them using the buttons at the bottom of the list |
| | 170 | |
| | 171 | [[Image(members-complex1-step-4_v19207.png,90%,center)]] |
| | 172 | |
| | 173 | The buttons offer following actions: |
| | 174 | |
| | 175 | ||= **Icon** =||= **Description** =|| |
| | 176 | || [[JOSMImage(dialogs/conflict/moveup)]] || Move up the selected entries by one position || |
| | 177 | || [[JOSMImage(dialogs/conflict/movedown)]] || Move down the selected entries by one position || |
| | 178 | || [[JOSMImage(dialogs/conflict/remove)]] || Remove the selected entries from the list of merged elements || |
| | 179 | |
| | 180 | Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node/member list: |
| | 181 | |
| | 182 | [[Image(members-complex1-step-5_v19207.png,90%,center)]] |
| | 183 | |
| | 184 | 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. |
