Context Navigation

Editing Help/Dialog/ConflictList

Adjust edit area height: Edit side-by-side

[[TranslatedPages]]
= Conflict List Dialog =

[[Image(source:/trunk/images/dialogs/conflict.png)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''

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

== Showing/Hiding the Conflict List Dialog ==

* 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 ==

[[Image(conflict_list_dialog.png)]] [[BR]]

* 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.

* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve''' launches the [wiki:/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.

* [[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)]] '''Zoom to selection''' if the selected element is not visible in the current view.

=== 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]

----
Back to [wiki:/Help/ToggleDialogs Toggle Dialogs][[BR]]
Back to [wiki:/Help Main Help]

Note: See WikiFormatting and TracWiki for help on editing wiki content.

Change information

Your email or username:

E-mail address and name can be saved in the Preferences

Comment about this change (optional):

Attachments (1)

conflict_list_dialog.png (166.0 KB ) - added by skyper 15 years ago. fixed new screenshot

Download all attachments as: .zip

Note: See TracWiki for help on using the wiki.