From e7a4e8923f2a866299b1f2df53f89ad627ef3e56 Mon Sep 17 00:00:00 2001 From: Mike Stankavich Date: Sat, 30 May 2026 10:51:06 -0500 Subject: [PATCH] chore: standardize worktree location on .claude/worktrees/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Align all worktree signals on the path Claude Code's native EnterWorktree tool actually writes to. Previously .gitignore ignored a root-level .worktrees/ that the native tool never used, while worktrees landed in the non-ignored .claude/worktrees/ — producing recurring confusion and stray untracked .claude/ noise. - .gitignore: ignore .claude/worktrees/ (narrow — rest of .claude/ stays tracked) instead of the unused .worktrees/ - CLAUDE.md: declare .claude/worktrees/ as the canonical, cross-repo worktree location so the highest-priority signal is unambiguous Cross-repo: platform agent concurs; platform migrates from its .worktrees/-via-symlink bridge to match, pending Mike's direct confirmation. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitignore | 5 +++-- CLAUDE.md | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4188f0d..adce806 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ # Dependencies node_modules/ -# Git worktrees -.worktrees/ +# Git worktrees — Claude Code's native worktree tool writes here; this is the +# canonical location (gitignored). Narrow ignore: the rest of .claude/ stays tracked. +.claude/worktrees/ # Docusaurus build/ diff --git a/CLAUDE.md b/CLAUDE.md index 7722d7e..8a74488 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -34,6 +34,10 @@ pnpm lint # Linting 5. Use conventional commits: `feat:`, `fix:`, `docs:`, `chore:` 6. Prefer incremental commits over amending +## Worktrees + +Use **`.claude/worktrees/`** for git worktrees — this is the canonical location across all trakrf repos. Claude Code's native worktree tool (`EnterWorktree`) writes there and cannot be redirected, so the convention matches the tool rather than fighting it. The directory is gitignored (narrowly — the rest of `.claude/` stays tracked). Do not reintroduce a root-level `.worktrees/` or a symlink bridge. + ## Style & Conventions - **TypeScript** for any config or custom components