Watch it
Sub-branches mode walkthrough (10 min)
What a Sub-branch is
A Sub-branch is a copy made from a Branch, rather than from Live. Each person on the team takes their own Sub-branch, works in it, and merges it back into the shared Branch when their piece is done. Once every piece is in, the team tests the whole Branch together and publishes it. Everything lands on Live at once. Sub-branches follow the same rules with their Branch that Branches follow with Live. They live in Sandbox, save as they go, and can be tested at any time.
A Branch expanded to show its Sub-branches, on the Deployments page
Working on an update with several people
1
Create one shared Branch
One Branch for the whole piece of work.
2
Each person creates a Sub-branch
Every Sub-branch comes off that shared Branch.
3
Make your changes
Each person works in their own Sub-branch. It saves as you go.
4
Test each Sub-branch
Run tests on a Sub-branch to check its changes on their own before merging.
5
Merge each Sub-branch back
Merge into the shared Branch as each piece is finished.
6
Test the Branch
Test all the changes together.
7
Move to Staging (optional)
Move the Branch to Staging from its actions menu on the Deployments page, then test it the way a customer would.
8
Publish
Publish the Branch. Everything lands on Live at once.
Handling an out of sync Sub-branch
Out of sync works the same way as in Branches mode, with one difference. A Branch syncs with Live. A Sub-branch syncs with its parent Branch. So if a colleague merges their Sub-branch into the shared Branch before you do, your Sub-branch is marked out of sync. Sync to pull their changes into yours, resolve any conflicts, test, then merge.
Merging is unavailable until the Sub-branch is synced with its Branch

