Changes between Version 15 and Version 16 of Help/Dialog/ConflictList
- Timestamp:
- 2019-12-26T21:39:47+01:00 (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Dialog/ConflictList
v15 v16 2 2 = Conflict List Dialog = 3 3 4 [[Image(source:/trunk/images/dialogs/conflict.png)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}''' 4 [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}''' 5 5 6 6 '''The Conflict List Dialog displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.''' … … 8 8 == Showing/Hiding the Conflict List Dialog == 9 9 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.10 * Click on the [[Image(source:/trunk/images/dialogs/conflict.png,20,middle)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog. 11 11 * Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List Dialog. 12 12 * It will also open automatically if conflicts were detected. … … 18 18 * The Conflict List Dialog displays a list of conflicts. The total amount of unresolved conflicts is shown in the header. You can select a conflict by clicking on it. 19 19 20 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve''' launches the [wikitr:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog. 20 * [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve''' launches the [wikitr:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog. 21 21 22 * [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 23 * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png)]] '''Zoom to selection''' if the selected element is not visible in the current view. 22 * [[Image(source:/trunk/images/dialogs/select.png,middle)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 23 * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png,middle)]] '''Zoom to selection''' if the selected element is not visible in the current view. 24 24 25 25 === Context menu === 26 26 The context menu has the following options: 27 * [[Image(source:/trunk/images/dialogs/autoscale/conflict.png)]] '''Zoom to conflict''' 28 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)** 29 * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)** 27 * [[Image(source:/trunk/images/dialogs/autoscale/conflict.png,middle)]] '''Zoom to conflict''' 28 * [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)** 29 * [[Image(source:/trunk/images/dialogs/conflict.png,middle)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)** 30 30 31 31 == See also == … … 34 34 35 35 ---- 36 Back to [wiki:/Help/ToggleDialogs Toggle Dialogs][[BR]] 37 Back to [wiki:/Help Main Help] 36 Back to [wikitr:/Help/ToggleDialogs Toggle Dialogs][[BR]] 37 Back to [wikitr:/Help Main Help]
