Branches
Branches split the same project into separate lines so you can experiment on one line while leaving another untouched. A new project starts with a single main branch, and the main label in the top bar shows the current branch.
Screen
Click main in the top bar to open the VERSION CONTROL window. Click CURRENT BRANCH in the top-left corner of the window to expand the branch list.
| Item | What it does |
|---|---|
Filter branches box | Finds branches by name |
| Open list | Chooses which kind of branches are shown: Open (open branches), Favorites, or Closed (closed branches) |
| FAVORITES | Shows the current branch with the current label, plus any branches you marked as favorites |
| ALL BRANCHES | The other open branches |
| + New Branch | Creates a new branch. If the project has no checkpoints yet, it is dimmed and can't be clicked |
Hover over a branch row in the list to show a Switch button and ⋮. The ⋮ menu has Favorite This Branch, Merge Into Current Branch, Version Control Graph, and Copy Branch ID; branches other than main also have Close This Branch and Delete This Branch.
You can also create a branch that starts from a checkpoint with New Branch in the checkpoint's details. Graph at the top of the window shows branches and checkpoints as a diagram (a different box color per branch, with arrows), and Compare shows the differences between two points.
Create and switch branches
- Make at least one checkpoint. A new branch starts from the current branch's latest checkpoint.
- Click CURRENT BRANCH → + New Branch. The
New branchdialog shows where the branch starts, for exampleFrom: d8283db · latest checkpoint of main. - Type a name in the
Branch namebox and click Create Branch.
The editor switches to the new branch right away, with no confirmation. The status bar briefly shows ● 연결 중... (Connecting...) and then returns to ● 실시간 (Live), and the branch name in the top bar changes. In our test the project's first scene opened, and the scene ID in the address changed too (each branch has its own scene IDs). The new branch's History contains the starting checkpoint under a different ID.
To go back to another branch, click Switch on its row in the list. This also switches right away, with no confirmation. It's safer to make a checkpoint before you switch.
Merge
First switch to the branch that will receive the changes (for example main), then click ⋮ → Merge Into Current Branch on the branch you want to bring in (for example exp). The Merge into main dialog opens.
| Option | Default | Meaning |
|---|---|---|
| Take a checkpoint of exp first | On | Saves the incoming branch's current state as a checkpoint before merging |
| Take a checkpoint of main first | On | Saves the receiving branch as a checkpoint before merging |
| Close exp after merging | Off | Closes the incoming branch after the merge |
Click Merge. Completing merge appears briefly, then the merge finishes. The receiving branch's History gets a Checkpoint before merging branch "exp" into "main" checkpoint, and the merged result shows in Changes as changes not yet saved in a checkpoint. Check the result, then make a checkpoint.
The conflict resolution screen
If both branches changed the same value differently, the Resolve conflicts exp → main window opens. In our test we set Box's Position X to -2 on main and to 1 on exp, made a checkpoint on each, and then merged.
- Click the conflicting scene (
MODIFIED) in the list on the left. The right side shows the entity and the changed values (red rowX -2, green rowX 1). - Under KEEP VERSION, choose which side to keep. DESTINATION is the receiving branch (
main); SOURCE is the incoming branch (exp). - Once every conflict has a choice, the Merge button at the bottom left becomes clickable. Click it to merge with the values you chose (in our test, choosing SOURCE set X to 1).
Close and delete branches
Click ⋮ → Close This Branch. A Close exp? confirmation appears; click Close Branch to remove the branch from the list. To see closed branches, change the Open list to Closed; reopen one with ⋮ → Re-Open This Branch on its row.
Delete This Branch deletes the branch. Pending Check the delete confirmation and whether a deleted branch can be restored