Sometimes Page Branching cannot merge a branch back into its original page automatically. Don’t worry – this is a safety net, not an error. It happens when both the branch and the original page were edited in the same place, so the app cannot decide on its own which version to keep.
How a merge conflict happens
Imagine a simple page with two paragraphs. You create a branch and fix a typo in the second paragraph on the branch. Before you merge, someone edits the same text on the original page in a different way.
Page Branching no longer knows whether to keep the original edit or apply the branch edit, so it shows a merge conflict instead of guessing.
📷 Screenshot needed: Side-by-side mock showing the same paragraph edited differently on the original page and the branch, leading to a conflict.
How to recognize a conflict
On Cloud, the Page Branching byline tells you when a branch is outdated or cannot be merged. You will also see conflict details when you try to merge or open the conflict resolution flow.
📷 Screenshot needed: The Page Branching byline on a branch page with a conflict / outdated indicator and a clear call-to-action like Update.
How to resolve a merge conflict
-
Open the branch page and use the byline to start Update or the conflict resolution dialog.
-
Review the differences. Added content is typically highlighted in one color and removed content in another (exact styling depends on the diff view).
-
Choose how to apply changes to the branch so it reflects what you want before the final merge.
-
When the branch is up to date and no longer conflicting, run Merge again.
📷 Screenshot needed: The Cloud conflict resolution dialog with the diff view, highlighting added and removed content.
If you are unsure which version to keep, coordinate with your team on the original page, sync the branch, then merge.
Tips to avoid conflicts
-
Merge branches soon after they are ready
-
Use Update on the branch before editing the original page for long-running work
-
Avoid editing the same paragraph on the original and the branch at the same time
Need a more visual walkthrough? Have a look at Merge Conflicts (Server/DC), which shows the same conflict scenario with screenshots from the Server/DC version of the app. The core workflow is the same on Cloud.