Context Navigation

Conflict

Timestamp:: 2024-09-12T10:31:16+02:00 (14 months ago)
Author:: leni
Comment:: properties corrected, adding single tag/ multiple tags and screen shots

Legend:

: Unmodified
: Added
: Removed
: Modified

Help/Dialog/Conflict

-              v20
+              v21
 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
  [#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])
  [#ResolvingConflictsNodeMemberList Members]:: Conflicts in members (only relevant for [[JOSMImage(data/relation)]] [wikitr:/Help/Concepts/Object#Relation relations])
+[[Image(tabs_v19207.png)]]
 If there are conflicts in a tab it is indicated with a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in front of the name and in case of tag conflicts the number of conflicting tags is display in brackets behind the name. All conflicts in these tabs need to be solved. \\
 …
  * 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.
+[[Image(conflict-dialog-versions_v19207.png)]]
 == Resolving differences between properties ==#ResolvingConflictsProperties
 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 the window for resolving property conflicts.
+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 propertie conflicts.
 In the example below "`Coordinates`" and "`Deleted State`" values in the two object versions are different, though, and JOSM therefore displays the row with a red background. In the first version the object is "`not deleted`", the opposite version is "`deleted`". You now have to decide which of these values you want to keep and which you want to discard.
 …
 [[Image(propertie-resolve-3_v19207.png)]]
 == Resolving differences between tags ==#Resolvingdifferencesbetweentags
 If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a red square ([[JOSMImage(dialogs/conflict/mergeincomplete,link=,top)]]) in the tab **''Tags''** plus the amount of conflicting tags. Click on the tab to display a dialog for resolving tag conflicts.
 …
 **Note**: To quickly solve single tag conflicts, the tags in the first tag of both outside tables are by default selected and therefore their background is blue and only the middle table has a red background.
+[[Image(tag-resolve-1-commented.png)]]
+* **single tag conflicts**
+Select the values you want to keep, in the example for instance the value on the left. If you either double-click on the value or click on one of the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the values and to 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)]]).
+[[Image(one-tag-resolve-1_v19207.png)]]
+[[Image(tag-resolve-2-commented.png)]]
+* **multiple tags conflicts**
+[[Image(tags-resolve-1_v19207.png)]]
+Select the values you want to keep :
+* **single tag conflicts**
+in the example for instance the value on the left. If you either double-click on the value or click on one of the buttons between the tables, [[JOSMImage(dialogs/conflict/tagkeepmine)]] or [[JOSMImage(dialogs/conflict/tagkeeptheir)]], you decide to keep the value and to discard the opposite value. The table in the middle now displays the value to keep and the background color turns to green. Selected value in the middle table can be cleared again with the button below the table ([[JOSMImage(dialogs/conflict/tagundecide)]]).
+[[Image(one-tag-resolve-2_v19207.png)]]
+* **multiple tags conflicts**
+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)]]).
+[[Image(tags-resolve-2-commented_v19207.png)]]
 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.
+[[Image(tag-resolve-3-commented.png)]]
+* **single tag conflicts**
+[[Image(one-tag-resolve-3-commented_v19207.png)]]
+* **multiple tags conflicts**
+[[Image(tags-resolve-3-commented_v19207.png)]]
 == Resolving differences in the node/member list of two versions of a way/relation ==#ResolvingConflictsNodeMemberList