Rebasing, Merging, and Syncing

To keep your workspace up to date with the latest changes from main, you can rebase or merge your dev branch onto main, then run spaces sync.

Create a workspace with a dev branch for the repo you’re working on:
```
spaces co my-project fix-the-bug
cd fix-the-bug
```
See Using spaces co for details on co.spaces.toml.
Develop normally — make changes, commit, push on your dev branch.
Rebase or merge and sync — if a teammate pushes changes that modify the checkout rules (e.g. a pinned SDK version or adds a new dependency), run:
```
git fetch origin main
git rebase origin/main
spaces sync
```

Run builds and tests as usual:

spaces run //my-project:build
spaces run //:test

Multiple Dev Branches

You can create dev branches in multiple repos within the same workspace. Pass multiple entries in new-branch:

spaces checkout-repo \
  --url=https://github.com/my-org/my-workspace \
  --rev=main \
  --new-branch=my-lib \
  --new-branch=my-app \
  --name=cross-cutting-change

Or in co.spaces.toml:

[cross-cutting.Repo]
url = "https://github.com/my-org/my-workspace"
rev = "main"
new-branch = ["my-lib", "my-app"]

Both my-lib and my-app are treated as dev branches and will be skipped during spaces sync.

Promoting a Repo to a Dev Branch

Run spaces sync --dev-branch=<path to the repo in the workspace> to promote a repo to a dev branch. This will prevent spaces from syncing that repo, treating it as a dev branch for the life of the workspace.

Adding Run Rules Using Spaces Co