Resolving sync conflicts
Git Sync never overwrites work. When a doc was edited in WordPress and its file changed in the repository since the last sync, PinkDocs flags it as a conflict and waits for you to choose.
Find conflicts
Conflicts are listed under Docs changed in both places on the PinkDocs → Git Sync page. Every other doc keeps syncing as normal.
Choose a version
Compare the two versions
Open the doc in WordPress, and its file on GitHub or GitLab, to see what changed on each side.
Keep one side
Click Keep WordPress to push the doc to the repository, or Keep repository to pull the file into the doc.
Or resolve them all at once
With several conflicts, keep all of one side in one click.
Avoid conflicts
| Tip | Why it helps |
|---|---|
| Turn on Push when a doc is published or updated | WordPress edits reach the repository in seconds, before anyone edits the file |
| Add the webhook | Commits reach WordPress in seconds, before anyone edits the doc |
| Use Preview changes before Sync now | See every doc a sync would create, update, push or move to drafts, and why |
| Pick one direction for docs-as-code teams | With Repository → WordPress, the repository always wins |
Common questions
PinkDocs matches docs to files with the same slug. In two-way mode, any that differ show as conflicts, and you can pick a side for all of them at once.
No. Only the conflicting docs wait for you.
Yes. Preview changes lists every change and why, without changing anything.
