Changes between Version 15 and Version 16 of Help/Dialog/Conflict

Timestamp:

2020-03-10T18:29:26+01:00 (4 years ago)

Author:

stoecker

Comment:

Directory rework, see #18845

Help/Dialog/Conflict

@@ -8 +8 @@
 
 == 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 [[Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts.
+If the tags of one version of an objects are different from the tags of another version, the Conflict dialog shows a [[JOSMImage(dialogs/conflict/mergeincomplete,middle)]] in the tab '''Tags'''. Click on the tab to display a dialog for resolving tag conflicts.
 
 There are three tables displayed in this dialog, from left to right:
@@ -19 +19 @@
 [[Image(tag-resolve-1-commented.png)]]
 
-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 [[Image(source:trunk/images/dialogs/conflict/tagkeepmine.svg,middle)]], 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. 
+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 [[JOSMImage(dialogs/conflict/tagkeepmine,middle)]], 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. 
 
 
@@ -29 +29 @@
 
 == Resolving differences in the node/member list of two versions of a way/relation ==
-If you see the symbol [[Image(source:trunk/images/dialogs/conflict/mergeincomplete.svg,middle)]] in the tab '''Nodes''' respectively '''Members''' then you have to resolve differences in the list of [wikitr:/Help/Concepts/Object#Nodes nodes] of two [wikitr:/Help/Concepts/Object#Ways ways] respectively the list of members of two [wikitr:/Help/Concepts/Object#Relations relations]. There are three columns in the respective panel (see screen shot below):
+If you see the symbol [[JOSMImage(dialogs/conflict/mergeincomplete,middle)]] in the tab '''Nodes''' respectively '''Members''' then you have to resolve differences in the list of [wikitr:/Help/Concepts/Object#Nodes nodes] of two [wikitr:/Help/Concepts/Object#Ways ways] respectively the list of members of two [wikitr:/Help/Concepts/Object#Relations relations]. There are three columns in the respective panel (see screen shot below):
 * the leftmost table displays the list of nodes/members of the the local object version 
 * the rightmost table displays the list of nodes/members of the the server object version 
@@ -54 +54 @@
 [[Image(simple1-step-1.png)]]
 
-Then, click [[Image(source:trunk/images/dialogs/conflict/copystartleft.svg,middle)]] to copy the selected nodes to the middle table with the merged nodes:
+Then, click [[JOSMImage(dialogs/conflict/copystartleft,middle)]] to copy the selected nodes to the middle table with the merged nodes:
 
 [[Image(simple1-step-2.png)]]
@@ -62 +62 @@
 [[Image(simple1-step-3.png)]]
 
-The symbol in the nodes tab now switched to [[Image(source:/trunk/images/misc/green_check.svg,middle)]] and you can apply the merge decisions.
+The symbol in the nodes tab now switched to [[JOSMImage(misc/green_check,middle)]] and you can apply the merge decisions.
 
 === Support for comparing node/member lists ===