Changes between Version 18 and Version 19 of Help/Dialog/Conflict


Ignore:
Timestamp:
2024-09-09T19:41:16+02:00 (16 months ago)
Author:
leni
Comment:

Update Resolving differences between properties

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v18 v19  
    66**The Conflict Dialog is used to resolve [wikitr:/Help/Concepts/Conflict conflicts] between two [wikitr:/Help/Concepts/Object#Objectversionsandhistory versions] of an OSM object.**
    77
    8 [[Image(conflict-dialog.png)]]
     8[[Image(conflict-dialog_v19207.png)]]
    99
    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:
    … …  
    2525 * 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.
    2626
     27
    2728== Resolving differences between properties ==#ResolvingConflictsProperties
     29If 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.
     30
     31In 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.
     32
     33[[Image(propertie-resolve-1_v19207.png)]]
     34
     35Select the values you want to keep, in the example for instance the value on the left. If you 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.
     36
     37[[Image(propertie-resolve-2_v19207.png)]]
     38
     39The 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)]]).\\
     40Once 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.
     41
     42[[Image(propertie-resolve-3_v19207.png)]]
    2843
    2944== Resolving differences between tags ==#Resolvingdifferencesbetweentags