Skip to content

docs: note merge-train/spartan-v6 → v6-next in the base-branch table #24585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 1 commit into from
Jul 7, 2026
Merged

docs: note merge-train/spartan-v6 → v6-next in the base-branch table #24585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Otherwise infer from the component being worked in:
| `barretenberg/cpp/src/barretenberg/vm2/**` | `merge-train/avm` |
| everything else | `next` |

The bases above target the `next` line. For work scoped to the v5 release line, use `merge-train/spartan-v5` (which targets `v5-next`) in place of `merge-train/spartan`.
The bases above target the `next` line. For work scoped to a release line, use the matching `merge-train/spartan-v<N>` in place of `merge-train/spartan`: `merge-train/spartan-v5` targets `v5-next`, and `merge-train/spartan-v6` targets `v6-next` (the public staging line for v6 work).

Use the discovered base in `git diff origin/<base>...HEAD` and `git log origin/<base>..HEAD`. Always `git fetch` before creating branches so the base is not stale.
</critical_never_assume_master>
Expand Down
Loading