Changes between Version 17 and Version 18 of Help/Dialog/ConflictList


Ignore:
Timestamp:
2020-03-23T13:20:51+01:00 (4 months ago)
Author:
skyper
Comment:

small fixes and updates

Legend:

Unmodified
Added
Removed
Modified
  • Help/Dialog/ConflictList

    v17 v18  
    11[[TranslatedPages]]
    2 = Conflict List Dialog =
    32
    4 [[JOSMImage(dialogs/conflict,middle)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''
     3= Conflict List =
    54
    6 '''The Conflict List Dialog displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.'''
     5[[JOSMImage(dialogs/conflict,middle,48,lionk=,margin-right=20)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}''' — one of the [wikitr:/Help/ToggleDialogs#Toactivateawindow JOSM panels]
    76
    8 == Showing/Hiding the Conflict List Dialog ==
     7'''The Conflict List displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.'''
    98
    10 * Click on the [[JOSMImage(dialogs/conflict,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 * Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List Dialog.
     9== Showing/Hiding the Conflict List ==
     10* Click on the [[JOSMImage(dialogs/conflict)]] conflict icon in the lower part of the [wikitr:/Help/EditToolbar Edit Toolbar] on the left side to show or hide the Conflict List.
     11* Click on the [[JOSMImage(dialogs/conflict)]] conflict icon in the [wikitr:/Help/Menu/Windows Windows menu] to show or hide the Conflict List.
     12* Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List.
    1213* It will also open automatically if conflicts were detected.
    1314
    14 == Working with the Conflict List Dialog ==
    15 
    16 [[Image(conflict_list_dialog.png)]] [[BR]]
    17 
    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 
    20 * [[JOSMImage(dialogs/conflict,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 
    22 * [[JOSMImage(dialogs/select,middle)]] '''Select''' selects the objects which the currently selected conflicts have been generated for.
    23  * Use '''View -> ''' [[JOSMImage(dialogs/autoscale/selection,middle)]] '''Zoom to selection''' if the selected element is not visible in the current view.
     15== Working with the Conflict List ==
     16[[Image(conflict_list_dialog.png,link=,right,margin-left=20,margin-right=150)]]
     17* The Conflict List 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.
     18* [[JOSMImage(dialogs/conflict)]] '''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.
     19* [[JOSMImage(dialogs/select)]] '''Select''' selects the objects which the currently selected conflicts have been generated for.
     20 * Use '''View -> ''' [[JOSMImage(dialogs/autoscale/selection)]] '''Zoom to selection''' if the selected element is not visible in the current view.
    2421
    2522=== Context menu ===
    2623The context menu has the following options:
    27 * [[JOSMImage(dialogs/autoscale/conflict,middle)]] '''Zoom to conflict'''
    28 * [[JOSMImage(dialogs/conflict,middle)]] '''Resolve to my versions''' will resolve all selected conflicts to my version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
    29 * [[JOSMImage(dialogs/conflict,middle)]] '''Resolve to their versions''' will resolve all selected conflicts to their version(s). Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
     24* [[JOSMImage(dialogs/autoscale/conflict)]] '''Zoom to conflict'''
     25* [[JOSMImage(dialogs/conflict)]] '''Resolve to my versions''' will resolve all selected conflicts to my versions. Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
     26* [[JOSMImage(dialogs/conflict)]] '''Resolve to their versions''' will resolve all selected conflicts to their versions. Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
    3027
    3128== See also ==
    32 * [wikitr:/Help/Concepts/Conflict Conflict][[BR]]
     29* [wikitr:/Help/Concepts/Conflict Conflict]
    3330* [wikitr:/Help/Dialog/Conflict Conflict Dialog]
    3431
    3532----
    36 Back to [wikitr:/Help/ToggleDialogs Toggle Dialogs][[BR]]
     33Back to [wikitr:/Help/Menu/Windows Windows menu]\\
     34Back to [wikitr:/Help/ToggleDialogs Sidebar]\\
    3735Back to [wikitr:/Help Main Help]