rogee/superpowers
1
0
Fork 0
mirror of https://github.com/obra/superpowers.git synced 2026-04-26 03:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: address spec review findings in both skill rewrites (PRI-974)

Browse Source 
using-git-worktrees: submodule guard now says "treat as normal repo"
instead of "proceed to Step 1" (preserves consent flow)
using-git-worktrees: directory priority summaries include global legacy

finishing-a-development-branch: move git branch -d after Step 6 cleanup
to make Bug #999 ordering unambiguous (merge -> worktree remove -> branch delete)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Drew Ritter
2026-04-06 14:34:02 -07:00
parent 5dade17572
commit c62b835a0b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
skills/finishing-a-development-branch/SKILL.md
View File

@@ -109,12 +109,14 @@ git merge <feature-branch>
# Verify tests on merged result # Verify tests on merged result
<test command> <test command>
# Only after merge succeeds: remove worktree, then delete branch # Only after merge succeeds: cleanup worktree (Step 6), then delete branch
# (See Step 6 for worktree cleanup)
git branch -d <feature-branch>
``` ```
Then: Cleanup worktree (Step 6) Then: Cleanup worktree (Step 6), then delete branch:
```bash
git branch -d <feature-branch>
```
#### Option 2: Push and Create PR #### Option 2: Push and Create PR

6
skills/using-git-worktrees/SKILL.md
View File

@@ -26,7 +26,7 @@ BRANCH=$(git branch --show-current)
**Submodule guard:** `GIT_DIR != GIT_COMMON` is also true inside git submodules. Before concluding "already in a worktree," verify you are not in a submodule: **Submodule guard:** `GIT_DIR != GIT_COMMON` is also true inside git submodules. Before concluding "already in a worktree," verify you are not in a submodule:
```bash ```bash
# If this returns a path, you're in a submodule, not a worktree — proceed to Step 1 # If this returns a path, you're in a submodule, not a worktree — treat as normal repo
git rev-parse --show-superproject-working-tree 2>/dev/null git rev-parse --show-superproject-working-tree 2>/dev/null
``` ```
@@ -198,7 +198,7 @@ Ready to implement <feature-name>
### Assuming directory location ### Assuming directory location
- **Problem:** Creates inconsistency, violates project conventions - **Problem:** Creates inconsistency, violates project conventions
- **Fix:** Follow priority: existing > instruction file > default - **Fix:** Follow priority: existing > global legacy > instruction file > default
### Proceeding with failing tests ### Proceeding with failing tests
@@ -217,7 +217,7 @@ Ready to implement <feature-name>
**Always:** **Always:**
- Run Step 0 detection first - Run Step 0 detection first
- Prefer native tools over git fallback - Prefer native tools over git fallback
- Follow directory priority: existing > instruction file > default - Follow directory priority: existing > global legacy > instruction file > default
- Verify directory is ignored for project-local - Verify directory is ignored for project-local
- Auto-detect and run project setup - Auto-detect and run project setup
- Verify clean test baseline - Verify clean test baseline