Skip to content

chore: adopt canonical .claude/worktrees/ convention #136

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
mikestankavich merged 1 commit into from
May 30, 2026
Merged

chore: adopt canonical .claude/worktrees/ convention #136

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/bin/
/node_modules/
.worktrees/
.env
.env.*
!.env.local.sample
Expand Down
5 changes: 5 additions & 0 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
- Conventional commits: `feat:`, `fix:`, `chore:`
- Merge PRs with `--merge` (never `--squash` or `--rebase`)

## Worktrees
- **Canonical location**: worktrees go in `.claude/worktrees/<name>/` (repo-relative), one per branch — gitignored as part of the `.claude/` ignore, and the same convention across all trakrf repos (docs/platform/infra). Since this repo ignores all of `.claude/`, this CLAUDE.md line is the only in-repo signal of the convention — keep it explicit.
- **Create** with the native `EnterWorktree` tool (writes to `.claude/worktrees/<name>`, auto-creates branch `worktree-<name>` — rename to a `feat/...`/`fix/...` branch after if desired). Do NOT use manual `git worktree add`, and do NOT create a `.worktrees/` dir or a `.claude/worktrees -> ../.worktrees` symlink (fresh-clone footgun). Manual `git worktree` is only the superpowers fallback for harnesses with no native tool — not us.
- **Cleanup**: `git worktree list` is authoritative (empty leftover dirs are not worktrees); use `ExitWorktree` (or `git worktree remove`) to leave/remove.

## Project Structure
- `terraform/bootstrap/` — one-time Cloudflare setup (R2 state bucket, API tokens)
- `terraform/cloudflare/` — Cloudflare infrastructure (DNS, Pages, email)
Expand Down
Loading