- Description
The conflict viewer for documents in the current timebag. The conflicts will be shown visually when you choose one document.
- Occurrence
To open this dialog, choose "Timebag" - "Show conflicts" from the menu bar.
Figure 2.18. The conflict viewer
|
The list of conflicted documents This list shows documents contain conflicts. Unless these conflicts are removed, this timebag is kept from being synchronized with. |
|
Use the current working copy Overwrite the document in the timebag with the working copy one. |
|
Use the latest one in the timebag Overwrite the working copy document with the latest one in the timebag. |
|
Close Close this dialog. |
|
Execute action Execute the selected action. |
