Changes between Version 26 and Version 27 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-09-30T14:13:14+02:00 (18 months ago)
Author:
skyper
Comment:

add a sentence about basic version info

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v26 v27  
    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:
    1111
    12  [#ResolvingConflictsProperties Properties]:: Conflicts in main properties of the object
     12 [#ResolvingConflictsProperties Properties]:: Basic information of the object and conflicts in main properties of the object
    1313 [#Resolvingdifferencesbetweentags Tags]:: Conflicts in [wikitr:/Help/Concepts/Object#Tags1 tags]
    1414 [#ResolvingConflictsNodeMemberList Nodes]:: Conflicts in the node list (only relevant for [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways])
    … …  
    3434If the properties (`Coordinates` or `Deleted State`) of one version of an object are different from the properties of another version, the Conflict dialog shows a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in the tab **''Properties''**. Click on the tab to display a dialog for resolving properties conflicts.
    3535
     36The first couple rows display basic information of the object similar to the [[JOSMImage(dialogs/history)]] [wikitr:/Help/Action/ObjectHistory History Dialog], see [wikitr:/Help/Action/ObjectHistory#Basicinformationaboutaversion Basic information about version].
    3637 Coordinates:: The coordinates of the node. Only relevant for nodes and if the node was moved or deleted.
    3738 Deleted State:: The state of the object, e.g. if it is still present or if it was deleted.