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


Ignore:
Timestamp:
2023-01-25T16:12:09+01:00 (2 years ago)
Author:
skyper
Comment:

add hint about "their version" in case of merge and relation editor

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v16 v17  
    11[[TranslatedPages(outdated=This page needs a review as the conflict dialog changed a bit and the member tab is not documented.)]]
     2
    23= Conflict Dialog =
    34[[PageOutline(1-10,Table of Contents)]]
    … …  
    1415* '''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.
    1516* '''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.
    1619
    1720In 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.
    … …  
    3033== Resolving differences in the node/member list of two versions of a way/relation ==
    3134If 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):
    32 * the leftmost table displays the list of nodes/members of the the local object version 
    33 * the rightmost table displays the list of nodes/members of the the server object version 
     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
    3437* the table in the middle shows the list of nodes/members of the merged ways
    3538