Conflicts and a diverged project
What to do when the cloud moved on while you worked, and how to resolve a conflict.
Your working tree and the cloud project diverge when both got new commits since they last agreed: you committed locally while someone else pushed, or while a save in the web app (World Builder, Skills Editor, Object Database) wrote to the cloud project.
Signs
zeon pushrefuses:the cloud has changed since your last sync — run zeon sync to merge your work with the cloud and push.zeon run,zeon pyorzeon briefprint a notice that the cloud project moved on.
In both cases, run zeon sync. It merges the two sides and pushes. Most of the time it finishes on its own.
Resolving a conflict
When the same lines of a text file changed on both sides, zeon sync stops:
CONFLICT workflows/plate_transfer.json
merge needs your input — edit the file(s) above to keep what you want, then run `zeon sync --continue`.
The file now contains both versions between markers:
<<<<<<< HEAD
{"name": "plate", "type": "object", "defaultValue": "wellplate"},
=======
{"name": "plate", "type": "object", "defaultValue": "plate_b"},
>>>>>>> remote
The part between <<<<<<< HEAD and ======= is yours; the part between ======= and >>>>>>> remote is the cloud's. Edit the file to what you want and delete the three marker lines. Then:
zeon status # nothing listed under Unmerged
zeon sync --continuezeon sync --continue refuses while any file still has markers. To give up instead, zeon sync --abort restores your files and leaves the cloud untouched.
A JSON file with markers in it is not valid JSON; resolve it before you load the project.
Binary files
Binary files (meshes, images, archives) cannot be merged line by line. When both sides changed one, the sync keeps the cloud's version in place and saves yours under .zeon/backups/<path>:
kept the cloud version of data/plate.png (a binary file can't be merged) — your local copy is saved at .zeon/backups/data/plate.png
Copy your version back over it if that is the one you want, then sync again.
Avoiding it
- Run
zeon syncbefore you start editing, and often while you work. - After saving anything in the web app,
zeon pullorzeon syncbefore you edit the same files locally.
Updated 9 days ago