Changes between Version 11 and Version 12 of Help/Dialog/Conflict
- Timestamp:
- 2019-07-24T13:20:35+02:00 (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/Conflict
v11 v12 3 3 [[PageOutline(1-10,Table of Contents)]] 4 4 5 '''The Conflict Dialog is used to resolve [wiki :Help/Concepts/Conflict conflicts] between two [wiki:/Help/Concepts/Objectversions] of an OSM object.'''5 '''The Conflict Dialog is used to resolve [wikitr:/Help/Concepts/Conflict conflicts] between two [wikitr:/Help/Concepts/Object#Objectversionsandhistory versions] of an OSM object.''' Depending on the object type the dialog may have different tabs, though, the "Properties" and the "Tags" tab are always present. 6 6 7 7 [[Image(conflict-dialog.png)]] … … 19 19 [[Image(tag-resolve-1-commented.png)]] 20 20 21 Click on the valueyou want to keep, in the example for instanceonthe value on the left. If you either double-click on the value or click on [[Image(source:trunk/images/dialogs/conflict/tagkeepmine.svg,middle)]], you decide to keep the valueand to discard the opposite value. The table in the middle now displays the value to keep and the background color turns to green.21 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 [[Image(source:trunk/images/dialogs/conflict/tagkeepmine.svg,middle)]], 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. 22 22 23 23 … … 28 28 [[Image(tag-resolve-3-commented.png)]] 29 29 30 == Resolving differences in the node list of two versions of a way == 31 If you see the symbol [[Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Nodes''' then you have to resolve differences in the list of [wiki :Help/Concepts/Object nodes] of two [wiki:Help/Concepts/Object ways]. There are three columns in the respective panel (see screen shot below):32 * the leftmost table displays the list of nodes of the the local object version 33 * the rightmost table displays the list of nodes of the the server object version 34 * the table in the middle shows the list of nodes of the merged ways 30 == Resolving differences in the node/member list of two versions of a way/relation == 31 If you see the symbol [[Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Nodes''' respectively '''Members''' then you have to resolve differences in the list of [wikitr:/Help/Concepts/Object#Nodes nodes] of two [wikitr:/Help/Concepts/Object#Ways ways] respectively the list of members of two [wikitr:/Help/Concepts/Object#Relations relations]. There are three columns in the respective panel (see screen shot below): 32 * the leftmost table displays the list of nodes/members of the the local object version 33 * the rightmost table displays the list of nodes/members of the the server object version 34 * the table in the middle shows the list of nodes/members of the merged ways 35 35 36 36 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). 37 38 37 39 38 [[Image(node-resolve-main-commented.png)]] 40 39 41 40 === The standard workflow === 42 The standard workflow to resolve conflicts in the node lists of two [wiki:Help/Concepts/Objectobject versions]consists of three steps:41 The standard workflow to resolve conflicts in the node lists of two object versions consists of three steps: 43 42 44 43 1. Pick nodes from either object version and reorder the resulting node list if necessary … … 65 64 The symbol in the nodes tab now switched to [[Image(source:/trunk/images/misc/green_check.svg,middle)]] and you can apply the merge decisions. 66 65 67 === Support for comparing node lists === 68 It can be difficult to find the differences between the node list of of two object versions, in particular for ways with many nodes. 66 === Support for comparing node/member lists === 67 It can be difficult to find the differences between the node/member list of of two object versions, in particular for ways/relations with many nodes/members. 69 68 70 The Conflict Dialog supports you in finding the differences. It can compare two of the nodelists displayed ("my"nodelist, the mergednodelist, and "their"nodelist) and it can render the differences between them with specific background colors.69 The Conflict Dialog supports you in finding the differences. It can compare two of the lists displayed ("my" list, the merged list, and "their" list) and it can render the differences between them with specific background colors. 71 70 72 From the following combo box you can select which pair of nodelists to compare:71 From the following combo box you can select which pair of lists to compare: 73 72 74 73 [[Image(compare-options.png)]] … … 78 77 * '''Their with Merge''': compares the middle table with the rightmost table in the Conflict Dialog 79 78 80 Depending on the position of a node in the list different background colors are used: 81 * [[Image(compare-in-one-list-only.png,middle)]] - the node is in this list '''only'''. It isn't present in the opposite list. 82 * [[Image(compare-different-positions.png,middle)]] - the node is in both lists, but it is on different positions 83 * White background means that a node is in both lists at the same position. 79 Depending on the position of a node/member in the list different background colors are used: 80 * [[Image(compare-in-one-list-only.png,middle)]] - the node/member is in this list '''only'''. It isn't present in the opposite list. 81 * [[Image(compare-different-positions.png,middle)]] - the node/member is in both lists, but it is on different positions 82 * White background means that a node/member is in both lists at the same position. 84 83 85 84 == Hints == … … 89 88 90 89 ---- 91 Back to [wiki:Help Main Help] 90 Back to [wikitr:/Help/Concepts/Conflict Conflict][[BR]] 91 Back to [wikitr:/Help Main Help]
