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


Ignore:
Timestamp:
2024-09-13T14:12:29+02:00 (16 months ago)
Author:
DiGro
Comment:

Removed some double wording and corrected typos

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v22 v23  
    7474
    7575* **multiple tags conflicts**
    76 In 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)]]).
     76In 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. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
    7777
    7878[[Image(tags-resolve-2-commented_v19207.png,900)]]
    7979
    80 Once 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.
     80Once 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 and you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
    8181
    8282* **single tag conflicts**
    … …  
    9191== Resolving differences in the node list of two versions of a way ==#ResolvingConflictsNodeList
    9292If 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
     93* the leftmost table displays the list of nodes of the local object version
     94* the rightmost table displays the list of nodes of the server object version
    9595* the table in the middle shows the list of nodes of the merged way
    9696
    … …  
    124124
    125125=== Support for comparing node lists ===
    126 It can be difficult to find the differences between the node list of of two object versions, in particular for ways with many nodes.
     126It can be difficult to find the differences between the node list 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.
    … …  
    143143== Resolving differences in the member list of two versions of a relation ==#ResolvingConflictsMemberList
    144144If 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
     145* the leftmost table displays the list of members of the local object version
     146* the rightmost table displays the list of members of the server object version
    147147* the table in the middle shows the list of members of the merged way/relation
    148148
    149 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.
     149Initially, the middle table is empty. You should now decide which members to keep from the local dataset (the leftmost table) and which from the server dataset (the rightmost table) and in which order.
    150150
    151151**part in progress**