Changes between Version 17 and Version 18 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-09-09T16:46:00+02:00 (16 months ago)
Author:
skyper
Comment:

First update: update format syntax, general description and tag conflicts (still quite some work to fo)

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v17 v18  
    1 [[TranslatedPages(outdated=This page needs a review as the conflict dialog changed a bit and the member tab is not documented.)]]
     1[[TranslatedPages(outdated=This page needs a review as the conflict dialog changed a bit and the properties tab plus the buttons in the nodes and members tabs are not documented. Most screenshots are outdated)]]
    22
    33= Conflict Dialog =
    44[[PageOutline(1-10,Table of Contents)]]
    55 
    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**The Conflict Dialog is used to resolve [wikitr:/Help/Concepts/Conflict conflicts] between two [wikitr:/Help/Concepts/Object#Objectversionsandhistory versions] of an OSM object.**
    77
    88[[Image(conflict-dialog.png)]]
    99
    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.
     10The dialog has four tabs but depending on the [wikitr:/Help/Concepts/Object#NodesWaysRelations object type] only some are active, though, the ''Properties'' and the ''Tags'' tab are always active. The tabs from left to right are:
     11 [#ResolvingConflictsProperties Properties]:: Conflicts in main properties of the object
     12 [#Resolvingdifferencesbetweentags Tags]:: Conflicts in [wikitr:/Help/Concepts/Object#Tags1 tags]
     13 [#ResolvingConflictsNodeMemberList Nodes]:: Conflicts in the node list (only relevant for [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways])
     14 [#ResolvingConflictsNodeMemberList Members]:: Conflicts in members (only relevant for [[JOSMImage(data/relation)]] [wikitr:/Help/Concepts/Object#Relation relations])
    1215
    13 There are three tables displayed in this dialog, from left to right:
    14 * '''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.
    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.
    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.
     16If there are conflicts in a tab it is indicated with a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in front of the name and in case of tag conflicts the number of conflicting tags is display in brackets behind the name. All conflicts in these tabs need to be solved. \\
     17If there are no (more) conflicts in a tab it is indicated with a green check mark ([[JOSMImage(misc/green_check,link=,top)]]) in front of the name. Once all active tabs have a green check mark, the object's version conflict is solved and the dialog can be closed with [[JOSMImage(dialogs/conflict)]] **Apply Resolution**.
     18
     19All tabs have a similar structure and are basically three columns each containing a table, from left to right:
     20
     21* **My version**:  shows the first object version participating in this conflict. This is usually the [wikitr:/Help/Concepts/Object#Objectversionsandhistory object version] in your local data set.
     22* **Merged version**: shows the solution, e.g. the result after solving the conflict. This table is initially empty.
     23* **Their version**: shows the second object version participating in this conflict. This is usually the object version currently stored on the server.
    1724 * 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.
    1825 * 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.
    1926
    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.
     27== Resolving differences between properties ==#ResolvingConflictsProperties
     28
     29== Resolving differences between tags ==#Resolvingdifferencesbetweentags
     30If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in the tab **''Tags''** plus the amount of conflicting tags. Click on the tab to display a dialog for resolving tag conflicts.
     31
     32There are three tables displayed in this dialog, from left to right:
     33* **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.
     34* **Merged version**: shows the final tags. This table is initially empty. The more tag conflicts you resolve, the more tag values will we be displayed in this table.
     35* **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.
     36
     37In 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. \\
     38**Note**: To quickly solve single tag conflicts, the tags in the first tag of both outside tables are by default selected and therefore their background is blue and only the middle table has a red background.
    2139
    2240[[Image(tag-resolve-1-commented.png)]]
    2341
    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.
    25 
     42Select 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)]]).
    2643
    2744[[Image(tag-resolve-2-commented.png)]]
    2845
    29 When the button '''Apply Resolution''' is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
     46Once 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.
    3047
    3148[[Image(tag-resolve-3-commented.png)]]
    3249
    33 == 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):
     50== Resolving differences in the node/member list of two versions of a way/relation ==#ResolvingConflictsNodeMemberList
     51If 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):
    3552* the leftmost table displays the list of nodes/members of the the local object version
    3653* 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
     54* the table in the middle shows the list of nodes/members of the merged way/relation
    3855
    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).
     56Initially, 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.
    4057
    4158[[Image(node-resolve-main-commented.png)]]
    … …  
    4562
    46631. Pick nodes from either object version and reorder the resulting node list if necessary
    47 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.
    48 1. '''Apply the resolution'''
    49 
     641. 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.
     651. [[JOSMImage(dialogs/conflict)]] **Apply Resolution**
    5066
    5167=== A simple workflow: Keep the node list from your local object version ===
    52 The following example shows the workflow when you decide to keep all nodes in the same order from your local object version.[[BR]]
     68The following example shows the workflow when you decide to keep all nodes in the same order from your local object version. \\
    5369''(Example is out of date (new buttons), but still works.)''
    5470
    55 First, select all elements in the leftmost table (either using the mouse or by pressing Ctrl+A in the table) (see next screen shot):
     71First, select all elements in the leftmost table (either using the mouse or by pressing `Ctrl+A` in the table) (see next screen shot):
    5672
    5773[[Image(simple1-step-1.png)]]
    5874
    59 Then, click [[JOSMImage(dialogs/conflict/copystartleft,middle)]] to copy the selected nodes to the middle table with the merged nodes:
     75Then, 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:
    6076
    6177[[Image(simple1-step-2.png)]]
    6278
    63 Finally, click [[Image(button-freeze.png,middle)]] to freeze the resulting merged node list:
     79Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node list:
    6480
    6581[[Image(simple1-step-3.png)]]
    6682
    67 The symbol in the nodes tab now switched to [[JOSMImage(misc/green_check,middle)]] and you can apply the merge decisions.
     83The 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.
    6884
    6985=== Support for comparing node/member lists ===
    7086It 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.
    7187
    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.
     88The 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.
    7389
    7490From the following combo box you can select which pair of lists to compare:
    … …  
    7692[[Image(compare-options.png)]]
    7793
    78 * '''My with Their''': compares the leftmost table with the rightmost table in the Conflict Dialog
    79 * '''My with Merged''': compares the leftmost table with the middle table in the Conflict Dialog
    80 * '''Their with Merge''': compares the middle table with the rightmost table in the Conflict Dialog
     94* **My with Their**: compares the leftmost table with the rightmost table in the Conflict Dialog
     95* **My with Merged**: compares the leftmost table with the middle table in the Conflict Dialog
     96* **Their with Merge**: compares the middle table with the rightmost table in the Conflict Dialog
    8197
    8298Depending 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.
     99* [[Image(compare-in-one-list-only.png,link=,middle)]] - red - the node/member is in this list **only**. It isn't present in the opposite list.
     100* [[Image(compare-different-positions.png,link=,middle)]] - rose - the node/member is in both lists, but it is on different positions
     101* white background means that a node/member is in both lists at the same position
     102
    86103
    87104== Hints ==
    88 
    89105* Make sure you don't edit outside of the area you have downloaded in order to reduce the problem of conflicts
    90 * Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.
     106* Resolve conflicts by opening the [wikitr:/Help/Dialog/ConflictList Conflict Panel], selecting the one of the listed conflicts and choosing whether to accept ''theirs'' or ''mine''.
    91107
    92108----
    93 Back to [wikitr:/Help/Dialog/ConflictList Conflict List Dialog][[BR]]
    94 Back to [wikitr:/Help/Concepts/Conflict Conflict][[BR]]
     109Back to [wikitr:/Help/Dialog/ConflictList Conflict Panel] \\
     110Back to [wikitr:/Help/Concepts/Conflict Conflict] \\
    95111Back to [wikitr:/Help Main Help]