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 | | * [[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. |
21 | | |
22 | | * [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for. |
23 | | * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png)]] '''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. |
27 | | * [[Image(source:/trunk/images/dialogs/autoscale/conflict.png)]] '''Zoom to conflict''' |
28 | | * [[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)** |
29 | | * [[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)** |
| 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)** |