| | 2 | The Conflict List Dialog displays the list of [wiki:/Help/Concepts/Conflict conflicts] in the current data layer. |
| | 3 | |
| | 4 | == Showing/Hiding the Conflict List Dialog == |
| | 5 | |
| | 6 | [[Image(conflict-list-dialog-icon.png)]] |
| | 7 | * Click on the following icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog |
| | 8 | * Press {{{Alt-C}}} to show or hide the Conflict List Dialog |
| | 9 | |
| | 10 | == Working with the Conflict List Dialog == |
| | 11 | |
| | 12 | [[Image(conflict-list-dialog-commented.png)]] [[BR]] |
| | 13 | |
| | 14 | * The Conflict List Dialog displays a list of conflict. You can select a conflict by clicking on it. |
| | 15 | |
| | 16 | * Click on '''Resolve''' to launch the [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. |
| | 17 | |
| | 18 | * Click on '''Select''' to select the object which the currently selected conflict has been generated for. |
| | 19 | |
| | 20 | |
| | 21 | |
| | 22 | |
| | 23 | |
| | 24 | |
| | 25 | |
