Changes between Version 30 and Version 31 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-10-09T13:45:34+02:00 (7 months ago)
Author:
skyper
Comment:

clarify the number of rows for the objects' basic information

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v30 v31  
    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
    36 The 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]. \\
    37 The second couple rows display, in ''My version'' and in ''Their version'', the User (UserId) and the Changeset (ChangesetId) which updated this version of the object.
     36The first three rows display basic information of the object, for ''My version'' and for ''Their version'', similar to the [[JOSMImage(dialogs/history)]] [wikitr:/Help/Action/ObjectHistory History Dialog], see [wikitr:/Help/Action/ObjectHistory#Basicinformationaboutaversion Basic information about version].
     37
    3838 Coordinates:: The coordinates of the node. Only relevant for nodes and if the node was moved or deleted.
    3939 Deleted State:: The state of the object, e.g. if it is still present or if it was deleted.