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

Timestamp:

(multiple changes)

Author:

(multiple changes)

Comment:

(multiple changes)

Help/Dialog/Conflict

@@ -10 +10 @@
 The 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:
 
- [#ResolvingConflictsProperties Properties]:: Conflicts in main properties of the object
+ [#ResolvingConflictsProperties Properties]:: Basic information of the object and conflicts in main properties of the object
  [#Resolvingdifferencesbetweentags Tags]:: Conflicts in [wikitr:/Help/Concepts/Object#Tags1 tags]
  [#ResolvingConflictsNodeMemberList Nodes]:: Conflicts in the node list (only relevant for [[JOSMImage(data/way)]] [wikitr:/Help/Concepts/Object#Ways ways])
@@ -34 +34 @@
 If 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.
 
+The 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].
+
  Coordinates:: The coordinates of the node. Only relevant for nodes and if the node was moved or deleted.
  Deleted State:: The state of the object, e.g. if it is still present or if it was deleted.
@@ -47 +49 @@
 
 The table in the middle now displays the values to keep and the background color turns green. Selected values in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).\\
-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. 
+Once all property 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. 
 
 [[Image(propertie-resolve-3_v19207.png,60%,center)]]