From d56abbe7a830eba7098c2e98470ae5bfbef1ed20 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Tue, 7 Jul 2026 14:21:34 +0000 Subject: [PATCH] =?UTF-8?q?docs:=20note=20merge-train/spartan-v6=20?= =?UTF-8?q?=E2=86=92=20v6-next=20in=20the=20base-branch=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CLAUDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index d4df966e403d..6bb1f8f9e6fc 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -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` 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/...HEAD` and `git log origin/..HEAD`. Always `git fetch` before creating branches so the base is not stale.