Changes between Version 21 and Version 22 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-09-12T19:52:37+02:00 (16 months ago)
Author:
leni
Comment:

resizescreen shots, resume nodes of a way

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v21 v22  
    66**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
    8 [[Image(conflict-dialog_v19207.png)]]
     8[[Image(conflict-dialog_v19207.png,900)]]
    99
    1010The 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:
    … …  
    2828 * 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.
    2929
    30 [[Image(conflict-dialog-versions_v19207.png)]]
     30[[Image(conflict-dialog-versions_v19207.png,900)]]
    3131
    3232
    … …  
    3636In the example below "`Coordinates`" and "`Deleted State`" values in the two object versions are different, though, and JOSM therefore displays the row with a red background. In the first version the object is "`not deleted`", the opposite version is "`deleted`". You now have to decide which of these values you want to keep and which you want to discard.
    3737
    38 [[Image(propertie-resolve-1_v19207.png)]]
     38[[Image(propertie-resolve-1_v19207.png,900)]]
    3939
    4040Select the values you want to keep, in the example for instance the value on the left. If you 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.
    4141
    42 [[Image(propertie-resolve-2_v19207.png)]]
     42[[Image(propertie-resolve-2_v19207.png,900)]]
    4343
    4444The 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)]]).\\
    4545Once 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.
    4646
    47 [[Image(propertie-resolve-3_v19207.png)]]
     47[[Image(propertie-resolve-3_v19207.png,900)]]
    4848
    4949
    … …  
    6161* **single tag conflicts**
    6262
    63 [[Image(one-tag-resolve-1_v19207.png)]]
     63[[Image(one-tag-resolve-1_v19207.png,900)]]
    6464
    6565* **multiple tags conflicts**
    6666
    67 [[Image(tags-resolve-1_v19207.png)]]
     67[[Image(tags-resolve-1_v19207.png,900)]]
    6868
    6969Select the values you want to keep :
    … …  
    7171in 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 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. Selected value in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
    7272
    73 [[Image(one-tag-resolve-2_v19207.png​)]]
     73[[Image(one-tag-resolve-2_v19207.png,900​)]]
    7474
    7575* **multiple tags conflicts**
    7676In the example: If you double-click on a value, or you select more values by pressing click `+Ctrl` or click `+shift` and then click on the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the values and discard the opposite values. The table in the middle now displays the values to keep and the background color turns to green. be retained and the background colour changes to green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
    7777
    78 [[Image(tags-resolve-2-commented_v19207.png)]]
     78[[Image(tags-resolve-2-commented_v19207.png,900)]]
    7979
    8080Once 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.
    … …  
    8282* **single tag conflicts**
    8383
    84 [[Image(one-tag-resolve-3-commented_v19207.png)]]
     84[[Image(one-tag-resolve-3-commented_v19207.png,900)]]
    8585
    8686* **multiple tags conflicts**
    8787
    88 [[Image(tags-resolve-3-commented_v19207.png)]]
     88[[Image(tags-resolve-3-commented_v19207.png,900)]]
    8989
    90 == Resolving differences in the node/member list of two versions of a way/relation ==#ResolvingConflictsNodeMemberList
    91 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):
    92 * the leftmost table displays the list of nodes/members of the the local object version
    93 * the rightmost table displays the list of nodes/members of the the server object version
    94 * the table in the middle shows the list of nodes/members of the merged way/relation
    9590
    96 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.
     91== Resolving differences in the node list of two versions of a way ==#ResolvingConflictsNodeList
     92If 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 the local object version
     94* the rightmost table displays the list of nodes of the the server object version
     95* the table in the middle shows the list of nodes of the merged way
    9796
    98 [[Image(node-resolve-main-commented.png)]]
     97Initially, 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
     99[[Image(node-resolve-main-commented_v19207.png,900)]]
    99100
    100101=== The standard workflow ===
    … …  
    107108=== A simple workflow: Keep the node list from your local object version ===
    108109The following example shows the workflow when you decide to keep all nodes in the same order from your local object version. \\
    109 ''(Example is out of date (new buttons), but still works.)''
    110110
    111111First, select all elements in the leftmost table (either using the mouse or by pressing `Ctrl+A` in the table) (see next screen shot):
    112112
    113 [[Image(simple1-step-1.png)]]
     113[[Image(nodes-simple1-step-1_v19207.png,900)]]
    114114
    115115Then, 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:
    116116
    117 [[Image(simple1-step-2.png)]]
     117[[Image(nodes-simple1-step-2_v19207.png,900)]]
    118118
    119119Finally, click **Freeze** ([[Image(button-freeze.png,link=,middle)]]) to freeze the resulting merged node list:
    120120
    121 [[Image(simple1-step-3.png)]]
     121[[Image(nodes-simple1-step-3_v19207.png,900)]]
    122122
    123123The 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.
    124124
    125 === Support for comparing node/member lists ===
    126 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.
     125=== Support for comparing node lists ===
     126It can be difficult to find the differences between the node list of of two object versions, in particular for ways with many nodes.
    127127
    128128The 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.
    … …  
    136136* **Their with Merge**: compares the middle table with the rightmost table in the Conflict Dialog
    137137
    138 Depending on the position of a node/member in the list different background colors are used:
    139 * [[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.
    140 * [[Image(compare-different-positions.png,link=,middle)]] - rose - the node/member is in both lists, but it is on different positions
    141 * white background means that a node/member is in both lists at the same position
     138Depending 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
    142142
     143== Resolving differences in the member list of two versions of a relation ==#ResolvingConflictsMemberList
     144If 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 the local object version
     146* the rightmost table displays the list of members of the the server object version
     147* the table in the middle shows the list of members of the merged way/relation
     148
     149Initially, 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.
     150
     151**part in progress**
    143152
    144153== Hints ==