[[TranslatedPages]]

= Conflict List =

[[JOSMImage(dialogs/conflict,middle,48,lionk=,margin-right=20)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}''' — one of the [wikitr:/Help/ToggleDialogs#Toactivateawindow JOSM panels]

'''The Conflict List displays the list of [wikitr:/Help/Concepts/Conflict conflicts] in the current data layer.''' 

== Showing/Hiding the Conflict List ==
* 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.
* Click on the [[JOSMImage(dialogs/conflict)]] conflict icon in the [wikitr:/Help/Menu/Windows Windows menu] to show or hide the Conflict List.
* Press '''{{{Alt+Shift+C}}}''' to show or hide the Conflict List.
* It will also open automatically if conflicts were detected.

== Working with the Conflict List ==
[[Image(conflict_list_dialog.png,link=,right,margin-left=20,margin-right=150)]]
* 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.
* [[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.
* [[JOSMImage(dialogs/select)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. 
 * Use '''View -> ''' [[JOSMImage(dialogs/autoscale/selection)]] '''Zoom to selection''' if the selected element is not visible in the current view.

=== Context menu ===
The context menu has the following options:
* [[JOSMImage(dialogs/autoscale/conflict)]] '''Zoom to conflict'''
* [[JOSMImage(dialogs/conflict)]] '''Resolve to my versions''' will resolve all selected conflicts to my versions. Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**
* [[JOSMImage(dialogs/conflict)]] '''Resolve to their versions''' will resolve all selected conflicts to their versions. Use with care! **([wikitr:/Help/ExpertMode expert mode] only)**

== See also ==
* [wikitr:/Help/Concepts/Conflict Conflict]
* [wikitr:/Help/Dialog/Conflict Conflict Dialog]

----
Back to [wikitr:/Help/Menu/Windows Windows menu]\\
Back to [wikitr:/Help/ToggleDialogs Sidebar]\\
Back to [wikitr:/Help Main Help]