Changes between Version 6 and Version 7 of Help/Dialog/Conflict
- Timestamp:
- 2015-02-13T16:35:40+01:00 (10 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/Conflict
v6 v7 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 = Conflict Dialog = 3 [[ TOC(inline)]]3 [[PageOutline(1-10,,)]] 4 4 5 '''The Conflict Dialog is used to resolve [wiki: /Help/Concepts/Conflict conflicts] between two [wiki:/Help/Concepts/Object versions] of an OSM object.'''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 6 7 7 [[Image(conflict-dialog.png)]] 8 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.png)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts.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. 11 11 12 12 There are three tables displayed in this dialog, from left to right: 13 14 15 13 * '''My version''': shows the tags of the first object version participating in this conflict. These are usually the tags of the object version in your local data set. 14 * '''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 * '''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. 16 16 17 17 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 19 [[Image(tag-resolve-1-commented.png)]] 20 20 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.png)]], 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.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 value to keep and the background color turns to green. 22 22 23 23 … … 29 29 30 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.png)]] 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 33 34 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 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). … … 40 40 41 41 === 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:42 The standard workflow to resolve conflicts in the node lists of two [wiki:Help/Concepts/Object object versions] consists of three steps: 43 43 44 45 2. '''Freeze''' the resulting merged node list by clicking on the button [[Image(button-freeze.png)]]. When you freeze the merged node list you tell JOSM that all conflicts in the node list are resolved.46 3. '''Apply the resolution'''44 1. Pick nodes from either object version and reorder the resulting node list if necessary 45 1. '''Freeze''' the resulting merged node list by clicking on the button [[Image(button-freeze.png,middle)]]. When you freeze the merged node list you tell JOSM that all conflicts in the node list are resolved. 46 1. '''Apply the resolution''' 47 47 48 48 … … 51 51 ''(Example is out of date (new buttons), but still works.)'' 52 52 53 First, select all elements in the leftmost table (either using the mouse or by pressing Ctrl -A in the table) (see next screen shot):53 First, select all elements in the leftmost table (either using the mouse or by pressing Ctrl+A in the table) (see next screen shot): 54 54 55 55 [[Image(simple1-step-1.png)]] 56 56 57 Then, click [[Image(source: /trunk/images/dialogs/conflict/copystartleft.png)]] to copy the selected nodes to the middle table with the merged nodes: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: 58 58 59 59 [[Image(simple1-step-2.png)]] 60 60 61 Finally, click [[Image(button-freeze.png)]] to freeze the resulting merged node list: 61 Finally, click [[Image(button-freeze.png,middle)]] to freeze the resulting merged node list: 62 62 63 63 [[Image(simple1-step-3.png)]] 64 64 65 The symbol in the nodes tab now switched to [[Image(source: /trunk/images/dialogs/conflict/mergecomplete.png)]] and you can apply the merge decisions.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. 66 66 67 67 === Support for comparing node lists === … … 71 71 72 72 From the following combo box you can select which pair of node lists to compare: 73 73 74 [[Image(compare-options.png)]] 74 75 75 76 77 76 * '''My with Their''': compares the leftmost table with the rightmost table in the Conflict Dialog 77 * '''My with Merged''': compares the leftmost table with the middle table in the Conflict Dialog 78 * '''Their with Merge''': compares the middle table with the rightmost table in the Conflict Dialog 78 79 79 80 Depending on the position of a node in the list different background colors are used: 80 81 82 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. 83 84 84 85 == Hints == 85 86 86 87 87 * Make sure you don't edit outside of the area you have downloaded in order to reduce the problem of conflicts 88 * Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'. 88 89 89 90
