see on GitHub

Conflicts View


  • Manually resolve a conflict between two documents in this view.

  • For a conflict overview see: What is a Conflict

  • Note:
    By default, conflicts are resolved using the latest document version when no script is defined.
    Conflicts will be created only if this option is unchecked in Conflict Resolution.


The Conflicts View

Figure 1. Conflicts View

Resolve the Conflict

  1. The conflicted document - Click to open the resolve editor

  2. The conflicted document versions - Resolve to either version by clicking 'Use this'

  3. The conflicted document body - Resolve by modifying the document body directly

  4. Resolve Conflict By:

    • Resolve and Save - Click to save the resolved document version, or -
    • Delete - Click to delete this document