The editor

When two people edit

Each person edits on their own computer, so two people can change the site at once. Verso combines their work when it can, and asks when it can't.

Every editor works on their own copy of the site: their own folder, running their own Verso. The repository is where the copies meet. Most of the time they never collide.

Staying in step

When you open the editor, Verso pulls the latest published version of the site, so you start from what's live. It only does this when it's safe: when your folder has no unpublished changes. If you have some, it leaves them alone and says so in the terminal. Publish them, and you'll be back in step.

Publish pulls first

When you press Publish and someone else has published since you last pulled, the push is turned away. Verso then brings their changes in, places yours on top, and pushes again. You'll just see "Published". If you changed different pages, or different files, nothing more happens; both sets of changes go live.

When you both changed the same page

If you both changed the same page, Verso can't know which version is right, so it doesn't guess. It undoes the attempt, keeps your version safe on your computer, and shows both versions side by side:

  • Your version, saved on this computer and not yet published.
  • Their version, published by the other person, with their name and when they published it.

Each side is the real page, rendered in full, so you can scroll and compare. Press Keep this one on the version you want. If more than one page clashed, Verso asks about each page in turn. When every page has a choice, it brings in the rest of their changes, keeps the version you chose of each page, and publishes.

The version you didn't keep isn't lost. Both were published or saved as restore points, so it stays in History, where you can preview it, or restore it and copy across the parts you want.

Deciding later

You can close the side-by-side window without choosing. Verso remembers the clash: a note at the top of the editor says your last publish clashed, with a button to open the choice again. Your version stays saved but unpublished until you decide. If you publish, pull or reset in some other way first, the stale clash is cleared.

When it isn't just content

Verso only offers the side-by-side choice when every clashing file belongs to a page in content/. If you both changed the same template, block, stylesheet setting or verso.json, it stops and says so. Your work stays saved on your computer, unpublished, and a developer needs to combine the two versions with git.

This is deliberate. Picking one whole version of a template could quietly break pages the other person built, so it's a decision for someone who can read the code.

Avoiding clashes

  • Publish often. Small, frequent publishes rarely overlap.
  • Start fresh. Close and reopen the editor before a long session, so it pulls the latest version.
  • Split by page. If two people need to work at once, give them different pages.
  • Keep code changes separate. Developers changing templates can work on a branch and merge with ordinary git tools, away from editors.