Branches and Merging
A branch is a copy of the Project, made from a row of its history, that you change without changing Main, the Project everyone plays. When the idea works, you merge it into Main.
Make a branch
Section titled “Make a branch”- Click the branch chip at the top right, left of Save. It lists Main and the branches, with who has each open and whether it is running.
- Click Branch from here…, or open a row of Main in the History tab and click Branch from here… there.
- Type a name and click Make it and open.
The branch opens in a tab of its own, with its own Agent and its own History. Archive in the menu hides a branch; it still opens by its address. Show archived at the foot of the menu lists the hidden ones, and Unarchive puts one back in the list.
Merge a branch into Main
Section titled “Merge a branch into Main”Start from Main’s menu with Merge a branch into Main…, or from the branch’s History with Merge into Main…, which saves the branch first. The merge view opens in Main’s editor, in your tab. Main keeps working meanwhile.
- What changed on one side only combines by itself.
- What both sides changed is a pick: a value, a place in the hierarchy, lines of a script, a picture. The Pick panel shows what it was, Main’s, and the branch’s: click the side you want, and the merge shows it at once. For lines of a script or a JSON value, By hand lets you write them yourself. All Main’s and All
‘s in the bar pick every one. - What the rules fixed, so that every scene loads, is listed too: a reference to something the other side removed is cleared.
- If someone changes a picked thing on Main meanwhile, that pick is asked again. Your other picks stay.
Merge is enabled once nothing is left to pick. Main pauses for a few seconds while it is written, and the History tab gets one row, “Merged”, with “Before merging” under it. Every open page shows a line under the toolbar with Take me back, which restores “Before merging” for everyone.
A merge reads the branch as it was last saved. While the branch’s Sandbox runs, its newest edits come in after its next save, or merge from the branch’s own tab.
Ask the Agent
Section titled “Ask the Agent”Ask the Agent in Main: “Merge Boss attempt into Main, keep Main’s speed”. It lists the branches, picks what you named, and asks you about the rest. Each pick it makes has a one-line reason. It takes all of one side only when your message asks for all of it, and it goes back in History only when your message asks it to. It merges only when you ask and nothing is left to pick, when its Run ends, and it tells you how to get back. Its next Run is told what the merge brought in.
Your own agent, connected to the editor over MCP, has the same tools. It merges in your tab: you see its picks in the merge view, with its reason under each, and can change any of them.