Skip to content
Documentation

Resolve a Conflict

updated

A conflict happens when a document was changed both in Meldoc and in the repository, and the changes can’t be combined automatically. The document is left untouched and waits for a decision; the rest of the sync carries on.

A document in conflict is marked in the project tree, and the document itself says so above its content. Project administrators get a link from there to resolve it.

Resolve it

Open the conflict on the repository’s card in the project’s Repositories tab and select View diff.

Both sides edited the same file:

  • Take the repository version — the repository’s text replaces the document.
  • Keep the Meldoc version — the document stays, and its text goes to the repository through the sync pull request.

The file was deleted in the repository, but the document has unsynced edits:

  • Delete it here too — the document is removed from Meldoc.
  • Keep the Meldoc document — the document stays, and its file is restored through the sync pull request.

Only project administrators can resolve conflicts. Every resolution appears in the Audit Log and in the document’s History.

What’s next?

Sync Check — Catch conflicts before the pull request merges.

How a Sync Runs — How runs work.