Changes between Version 7 and Version 17 of Help/Dialog/Conflict
- Timestamp:
- (multiple changes)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/Conflict
v7 v17 1 1 [[TranslatedPages(outdated=This page needs a review as the conflict dialog changed a bit and the member tab is not documented.)]] 2 2 3 = Conflict Dialog = 3 [[PageOutline(1-10, ,)]]4 [[PageOutline(1-10,Table of Contents)]] 4 5 5 '''The Conflict Dialog is used to resolve [wiki :Help/Concepts/Conflict conflicts] between two [wiki:/Help/Concepts/Object versions] of an OSM object.'''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.''' Depending on the object type the dialog may have different tabs, though, the "Properties" and the "Tags" tab are always present. 6 7 7 8 [[Image(conflict-dialog.png)]] 8 9 9 == Resolving differences between tags == 10 If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a [[ Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts.10 == Resolving differences between tags ==#Resolvingdifferencesbetweentags 11 If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a [[JOSMImage(dialogs/conflict/mergeincomplete,middle)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts. 11 12 12 13 There are three tables displayed in this dialog, from left to right: … … 14 15 * '''Merged version''': shows the merged tags. This table is initially empty. The more tag conflicts you resolve, the more tag values will we be displayed in this table. 15 16 * '''Their version''': shows the tags of the second object version participating in this conflict. These are usually the tags of the object version currently stored on the server. 17 * In case of a conflict after [[JOSMImage(dialogs/mergedown)]] [wikitr:/Help/Action/MergeLayer Merge layer] or [[JOSMImage(dialogs/mergedown)]] [wikitr:/Help/Action/MergeSelection Merge selection] this is the version of the origin. 18 * 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. 16 19 17 20 In the example below both versions have a tag "`name`". The values in the two object versions are different, though, and JOSM therefore displays the row with a red background. The value of the first version is "`Secondary School`", the opposite version has a value "`Elementary School`". You now have to decide which of these values you want to keep and which you want to discard. … … 19 22 [[Image(tag-resolve-1-commented.png)]] 20 23 21 Click on the value you want to keep, in the example for instance on 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 value and to discard the opposite value. The table in the middle now displays the valueto keep and the background color turns to green.24 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 [[JOSMImage(dialogs/conflict/tagkeepmine,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 25 23 26 … … 28 31 [[Image(tag-resolve-3-commented.png)]] 29 32 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 version33 * the rightmost table displays the list of nodes of the the server object version34 * the table in the middle shows the list of nodes of the merged ways33 == Resolving differences in the node/member list of two versions of a way/relation == 34 If you see the symbol [[JOSMImage(dialogs/conflict/mergeincomplete,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): 35 * the leftmost table displays the list of nodes/members of the the local object version 36 * the rightmost table displays the list of nodes/members of the the server object version 37 * the table in the middle shows the list of nodes/members of the merged ways 35 38 36 39 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 40 39 41 [[Image(node-resolve-main-commented.png)]] 40 42 41 43 === The standard workflow === 42 The standard workflow to resolve conflicts in the node lists of two [wiki:Help/Concepts/Object object versions]consists of three steps:44 The standard workflow to resolve conflicts in the node lists of two object versions consists of three steps: 43 45 44 46 1. Pick nodes from either object version and reorder the resulting node list if necessary … … 55 57 [[Image(simple1-step-1.png)]] 56 58 57 Then, click [[ Image(source:trunk/images/dialogs/conflict/copystartleft.svg,middle)]] to copy the selected nodes to the middle table with the merged nodes:59 Then, click [[JOSMImage(dialogs/conflict/copystartleft,middle)]] to copy the selected nodes to the middle table with the merged nodes: 58 60 59 61 [[Image(simple1-step-2.png)]] … … 63 65 [[Image(simple1-step-3.png)]] 64 66 65 The symbol in the nodes tab now switched to [[ Image(source:trunk/images/dialogs/valid.png,middle)]] and you can apply the merge decisions.67 The symbol in the nodes tab now switched to [[JOSMImage(misc/green_check,middle)]] and you can apply the merge decisions. 66 68 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.69 === Support for comparing node/member lists === 70 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 71 70 The Conflict Dialog supports you in finding the differences. It can compare two of the node lists displayed ("my" node list, the merged node list, and "their" nodelist) and it can render the differences between them with specific background colors.72 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 73 72 From the following combo box you can select which pair of nodelists to compare:74 From the following combo box you can select which pair of lists to compare: 73 75 74 76 [[Image(compare-options.png)]] … … 78 80 * '''Their with Merge''': compares the middle table with the rightmost table in the Conflict Dialog 79 81 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 positions83 * White background means that a node is in both lists at the same position.82 Depending on the position of a node/member in the list different background colors are used: 83 * [[Image(compare-in-one-list-only.png,middle)]] - the node/member is in this list '''only'''. It isn't present in the opposite list. 84 * [[Image(compare-different-positions.png,middle)]] - the node/member is in both lists, but it is on different positions 85 * White background means that a node/member is in both lists at the same position. 84 86 85 87 == Hints == … … 88 90 * Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'. 89 91 90 91 92 ---- 92 Back to [wiki:Help Main Help] 93 Back to [wikitr:/Help/Dialog/ConflictList Conflict List Dialog][[BR]] 94 Back to [wikitr:/Help/Concepts/Conflict Conflict][[BR]] 95 Back to [wikitr:/Help Main Help]
