From ca5cf36d9dfe41be5cbb32ba1ff29d40e167b887 Mon Sep 17 00:00:00 2001 From: davion-knight <298846663+davion-knight@users.noreply.github.com> Date: Tue, 7 Jul 2026 12:59:46 -0500 Subject: [PATCH] docs(claude): fix stale branch-target guidance in ship-a-feature-branch CLAUDE.md's "ship a feature branch" section told agents to fetch and branch off origin/main. CONTRIBUTING.md's current policy (introduced 2026-07-06) is to base feature branches on test and target test in the pr -- main is reserved for docs-only changes, promoted from test by the maintainer. CLAUDE.md predates that policy (written 2026-06-16) and was never updated, so any agent following it verbatim opens a pr against the wrong base branch, which this repo's own data shows is the single most common reason a pr gets auto-closed. --- CLAUDE.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 636b8deb..084a933d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -87,9 +87,13 @@ For the embedding-heavy tests (separate job in CI): `pip install ## Ship a feature branch +`test` is the integration branch — base feature branches on it and +target it in the PR. Docs-only changes may branch off `main` instead +(see the worktree note below). + ```bash -git fetch origin main -git switch -c / origin/main +git fetch origin test +git switch -c / origin/test # … work … make check git add # never `git add -A` — leaks .claude/, web/, etc.