| 91 | | == Resolving differences in the node list of two versions of a way ==#ResolvingConflictsNodeList |
| 92 | | If you see a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,top,link=)]]) in the tab **''Nodes''** 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]. There are three columns of tables in the respective panel (see screen shot below): |
| 93 | | * the leftmost table displays the list of nodes of the local object version |
| 94 | | * the rightmost table displays the list of nodes of the server object version |
| 95 | | * the table in the middle shows the list of nodes of the merged way |
| 96 | | |
| 97 | | Initially, the middle table is empty. You should now decide which nodes to keep from the local dataset (the leftmost table) and which from the server dataset (the rightmost table) and in which order. |
| 98 | | |
| | 91 | == Resolving differences in the node/member list of two versions of a way/relation == |
| | 92 | Resolution methods are similar for both nodes and members. |
| | 93 | |
| | 94 | 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): |
| | 95 | * the leftmost table displays the list of nodes/members of the local object version |
| | 96 | * the rightmost table displays the list of nodes/members of the server object version |
| | 97 | * the table in the middle shows the list of nodes/member of the merged way |
| | 98 | |
| | 99 | Initially, the middle table is empty. You should now decide which nodes/members to keep from the local dataset (the leftmost table) and which from the server dataset (the rightmost table) and in which order. |
| | 100 | |
| | 101 | * **Screen with nodes** |
| 102 | | The standard workflow to resolve conflicts in the node lists of two object versions consists of three steps: |
| 103 | | |
| 104 | | 1. Pick nodes from either object version and reorder the resulting node list if necessary |
| 105 | | 1. Freeze the resulting merged node list by clicking on the **Freeze** button ([[Image(button-freeze.png,link=,middle)]]). When you freeze the merged node list you tell JOSM that all conflicts in the node list are resolved. |
| | 108 | The standard workflow to resolve conflicts in the node/member lists of two object versions consists of three steps: |
| | 109 | |
| | 110 | 1. Pick nodes/members from either object version and reorder the resulting node/member list if necessary |
| | 111 | 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. |
| 108 | | === A simple workflow: Keep the node list from your local object version === |
| 109 | | The following example shows the workflow when you decide to keep all nodes in the same order from your local object version. \\ |
| | 114 | |
| | 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. |
| 123 | | 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. |
| 124 | | |
| 125 | | === Support for comparing node lists === |
| 126 | | It can be difficult to find the differences between the node list of two object versions, in particular for ways with many nodes. |
| | 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,900)]] |
| | 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,900)]] |
| | 165 | |
| | 166 | [[Image(members-complex1-step-3_v19207.png,900)]] |
| | 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,900)]] |
| | 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,900)]] |
| | 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. |
| | 185 | |
| | 186 | === Support for comparing node/member lists === |
| | 187 | It can be difficult to find the differences between the node/member list of two object versions, in particular for ways with many nodes respectively relations with many members. |
| 138 | | Depending on the position of a node in the list different background colors are used: |
| 139 | | * [[Image(compare-in-one-list-only.png,link=,middle)]] - red - the node is in this list **only**. It isn't present in the opposite list. |
| 140 | | * [[Image(compare-different-positions.png,link=,middle)]] - rose - the node is in both lists, but it is on different positions |
| 141 | | * [[Image(compare-in-both-lists.png,link=,middle)]] green background means that a node is in both lists at the same position |
| 142 | | |
| 143 | | == Resolving differences in the member list of two versions of a relation ==#ResolvingConflictsMemberList |
| 144 | | If you see a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,top,link=)]]) in the tab **''Members''** then you have to resolve differences in 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): |
| 145 | | * the leftmost table displays the list of members of the local object version |
| 146 | | * the rightmost table displays the list of members of the server object version |
| 147 | | * the table in the middle shows the list of members of the merged way/relation |
| 148 | | |
| 149 | | Initially, the middle table is empty. You should now decide which members to keep from the local dataset (the leftmost table) and which from the server dataset (the rightmost table) and in which order. |
| 150 | | |
| 151 | | **part in progress** |
