wiki:Help/Dialog/ConflictList

Conflict List Dialog

source:/trunk/images/dialogs/conflict.png Keyboard shortcut: Alt+Shift+C

The Conflict List Dialog displays the list of conflicts in the current data layer.

Showing/Hiding the Conflict List Dialog

  • Click on the source:/trunk/images/dialogs/conflict.png 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

fixed new screenshot

  • 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.
  • source:/trunk/images/dialogs/conflict.png Resolve launches the 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.
  • source:/trunk/images/dialogs/select.png Select selects the objects which the currently selected conflicts have been generated for.
    • Use View -> 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:

  • source:/trunk/images/dialogs/autoscale/conflict.png Zoom to conflict
  • source:/trunk/images/dialogs/conflict.png Resolve to my versions will resolve all selected conflicts to my version(s). Use with care! (expert mode only)
  • source:/trunk/images/dialogs/conflict.png Resolve to their versions will resolve all selected conflicts to their version(s). Use with care! (expert mode only)

See also


Back to Toggle Dialogs
Back to Main Help

Last modified 21 months ago Last modified on 2016-01-15T23:33:37+01:00

Attachments (2)

Download all attachments as: .zip