Resolve a Conflict
Meldoc remembers the last version of each file both sides agreed on. When a change arrives, it compares three things: that agreed version, what is in the repository now, and what the document says now.
Most of the time only one side moved and there is nothing to decide. When both moved and the two changes cannot be combined automatically, the document is marked as a conflict and waits for you. The rest of the run carries on — one disputed file does not hold up a project.
Conflict markers never end up in your document. The CLI writes them into a file because there is a person with an editor in front of it. Here the document might be read by anyone, and could be published, so Meldoc leaves it untouched instead and tells you.
Two kinds, because the question is different
Both sides edited the same file. The question is which text. Open the conflict in the project’s Repositories panel and select View diff to see the two versions side by side, then choose:
- Take the repository version — the repository’s text is written into the document.
- Keep the Meldoc version — the document is left as it is, and the next export carries it into the pull request.
Either way the disagreement is settled and the next run stops seeing it. Neither choice writes to the repository directly; the Meldoc version travels the normal way, through the pull request.
The file was deleted upstream while the document had unsynced edits. The question is not which text but whether the page should exist:
- Delete it here too — the document is removed from Meldoc.
- Keep the Meldoc document — the document stays, and the next export puts its file back.
Who can resolve one
A project administrator. Anyone who can read the project can see that a conflict exists and what it is about.
Resolving stays available even in a workspace where repository sync has been switched off — otherwise a document could be parked with no way out.
What’s next?
Pre-Merge Check — Catch conflicts before the pull request merges, not after.
How a Sync Runs — How runs work.