Friendly conflict resolver
If someone else changed the same page, Orbit shows both versions side by side and lets you choose — no merge conflicts to untangle.
Two people editing the same page is normal. When you get the latest changes and a page was edited both on the site and by you, Orbit shows the site’s version and your version side by side. For each page, choose one of three:
- Use the site’s version
- Keep my version
- Edit by hand — combine the two yourself
If both sides made exactly the same change, there’s nothing to choose — Orbit just brings the latest in. Nothing goes live until you’ve resolved it and published as usual.