Changes between Version 13 and Version 14 of Help/Dialog/ConflictList

Timestamp:

2016-01-15T23:33:37+01:00 (10 years ago)

Author:

Klumbumbus

Comment:

+context menu, and small fixes, additions

Help/Dialog/ConflictList

@@ -10 +10 @@
 * Click on the [[Image(source:/trunk/images/dialogs/conflict.png,15)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog.
 * Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List Dialog.
+* It will also open automatically if conflicts were detected.
 
 == Working with the Conflict List Dialog == 
@@ -20 +21 @@
 
 * [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 
- * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png,15)]] '''Zoom to selection''' if the selected element is not visible in the current view.
+ * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png)]] '''Zoom to selection''' if the selected element is not visible in the current view.
 
-== see also ==
+=== Context menu ===
+The context menu has the following options:
+* [[Image(source:/trunk/images/dialogs/autoscale/conflict.png)]] '''Zoom to conflict'''
+* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([ExpertMode expert mode] only)**
+* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([ExpertMode expert mode] only)**
+
+== See also ==
 * [wiki:/Help/Concepts/Conflict Conflict][[BR]]
 * [wiki:/Help/Dialog/Conflict Conflict Dialog]