Resolving conflicts

A Document scan flags a conflict where sections of two documents in the same area disagree. A conflict belongs to the workspace. You settle it once, and the verdict applies to every repository that reads those documents.

​

The Conflicts list

Context › Conflicts lists every conflict, open ones first. The columns are Conflict, Area and Status, which is Open or Resolved. Filter by Status and Area.

​

Settling a conflict

Open a conflict to see the two documents side by side. Each one is marked Newer or Older, and the disputed sections are highlighted. The page also shows the scan’s assessment and its recommendation. Pick a verdict: Undo reverses a verdict. When the recommendation is to fix a document instead, the page shows a Suggested fix you can copy. You can also fix the document itself. Once its source syncs, the Scan button lights up.

​

Verdicts the scan applies itself

When the scan is highly confident, it applies the verdict itself. Such a conflict reads Auto-resolved or Auto-dismissed. Undo works the same way on it.

​

Open conflicts block Flow generation

Flow generation does not run for a repository while its slice of the corpus has an open conflict. It stores a blocked report and settles as a warning. Settling the last open conflict starts the Flow generation it blocked.

​

Next steps