Skip to main content
A conflict happens when a change was based on an older revision than the current cloud page. Northern Logic retains the competing text or move intent instead of silently overwriting the accepted revision. You need Editor or Vault admin access to resolve content conflicts.

​
Resolve a content conflict

  1. Open Conflicts and choose the affected file.
  2. Compare Cloud current and Retained candidate.
  3. Choose Keep cloud current to retain the accepted content, Use candidate to adopt the competing content, or edit Merged source and choose Save merged source.
  4. Reopen the page and confirm the intended text. Check its Activity and the relevant connection’s health.
In the page’s Activity comparison, the equivalent quick choices are Keep live and Use this version. Both create a new resolution revision; neither erases the earlier record. A manual merge is a complete Markdown body. Check the entire result, including frontmatter and sections you did not intend to change.

​
What happens on a paired machine

The ordinary local path returns to the cloud’s accepted content. The losing local body is retained in managed client state outside the knowledge root. Seeing the cloud text locally does not mean the candidate was discarded. Review it in the app.

​
Move and rename conflicts

Competing namespace changes retain the requested move, rename, or other operation. Selecting a text body does not apply a folder move. Inspect the current tree and retained intent, then carry out the intended organization change against the current state if appropriate. If the retained namespace conflict cannot be completed through the available controls, contact support.

​
Reduce repeat conflicts

Save before handing a page to another editor, let a paired machine catch up before large edits, and avoid editing the same page simultaneously in several tools. The app does not provide collaborative cursors or automatic Markdown merging.