Compare commits

..

3 Commits

Author SHA1 Message Date
Drew Ritter
b1e9711034 docs: drop brittle step-number chain from multi-repo row
Addresses review feedback on #1123. Replaces "(same Step 0→1a→1b flow,
matching branch names)" with plain-language instruction that doesn't
forward-reference section numbers that could rot under future edits.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-13 11:44:02 -07:00
Drew Ritter
d4464920ff feat: add multi-repo worktree guidance (#710) 2026-04-13 11:44:02 -07:00
Drew Ritter
a490478f8a fix: replace hardcoded /Users/jesse with generic placeholders (#858) 2026-04-13 11:43:54 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -251,7 +251,7 @@ Report with branch state:
**If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout. **If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout.
Has the user already indicated their worktree preference in your instructions? If not, ask for consent before creating a worktree: If the user has not already made their preferences about worktree isolation clear — check global and project agent instruction files (`CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) — ask for consent before creating a worktree:
> "Would you like me to set up an isolated worktree? It protects your current branch from changes." > "Would you like me to set up an isolated worktree? It protects your current branch from changes."
@@ -289,7 +289,7 @@ Follow this priority order:
``` ```
If found, use it (backward compatibility with legacy global path). If found, use it (backward compatibility with legacy global path).
3. **Check your instructions for a worktree directory preference.** If specified, use it without asking. 3. **Check your project's agent instruction file** (CLAUDE.md, GEMINI.md, AGENTS.md, .cursorrules, or equivalent) for a worktree directory preference. If specified, use it without asking.
4. **Default to `.worktrees/`.** 4. **Default to `.worktrees/`.**

View File

@@ -38,7 +38,7 @@ Report with branch state:
**If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout. **If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout.
Has the user already indicated their worktree preference in your instructions? If not, ask for consent before creating a worktree: If the user has not already made their preferences about worktree isolation clear — check global and project agent instruction files (`CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) — ask for consent before creating a worktree:
> "Would you like me to set up an isolated worktree? It protects your current branch from changes." > "Would you like me to set up an isolated worktree? It protects your current branch from changes."
@@ -64,7 +64,7 @@ Only proceed to Step 1b if you have no native worktree tool available.
Follow this priority order. Explicit user preference always beats observed filesystem state. Follow this priority order. Explicit user preference always beats observed filesystem state.
1. **Check your instructions for a declared worktree directory preference.** If the user has already specified one, use it without asking. 1. **Check global and project agent instruction files** (`~/.claude/CLAUDE.md`, `~/.config/gemini/AGENTS.md`, project-level `CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) for a declared worktree directory preference. If specified, use it without asking.
2. **Check for an existing project-local worktree directory:** 2. **Check for an existing project-local worktree directory:**
```bash ```bash