Skip to content

Commit 9b6abd7

Browse files
committed
fix: update /implement and /ship to use alpha as base branch
1 parent eb1096b commit 9b6abd7

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

.claude/skills/implement/SKILL.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ Implements a GitHub issue end-to-end: understand the issue, code it, validate it
1313

1414
---
1515

16+
# Step 0 — Detect state
17+
18+
Check if there are already commits on the branch vs `origin/alpha`:
19+
20+
- **No changes on branch** -> Step 1 (start from scratch)
21+
- **Changes already exist** -> Step 4 (skip to validate)
22+
23+
---
24+
1625
# Step 1 — Understand the issue
1726

1827
Extract `{owner}/{repo}` from `git remote get-url origin` (needed for API calls below).
@@ -31,7 +40,7 @@ Present the task list and confirm with the user before starting.
3140

3241
# Step 2 — Branch
3342

34-
Create `feat/issue-{N}-{slug}` from `origin/master`. If the current branch already tracks this issue, stay on it.
43+
Create `feat/issue-{N}-{slug}` from `origin/alpha`. If the current branch already tracks this issue, stay on it.
3544

3645
---
3746

.claude/skills/ship/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Check branch, commits, and existing PR. Route accordingly:
2222
- **Open PR, nothing unresolved** -> done, report status
2323
- **No commits on branch** -> nothing to ship, suggest `/implement`
2424

25-
Announce what was detected before proceeding.
25+
Infer issue number from branch name (`feat/issue-{N}-*`). Announce what was detected before proceeding.
2626

2727
---
2828

@@ -52,7 +52,7 @@ Generated with [Claude Code](https://claude.com/claude-code)
5252
Group commits by logical concern. Present the plan as a table and ask confirmation. For each group in dependency order:
5353

5454
- Branch naming: `split/{original-branch}/{short-name}`
55-
- First branch from `origin/master`, each subsequent branch from the previous one
55+
- First branch from `origin/alpha`, each subsequent branch from the previous one
5656
- Cherry-pick commits, validate via the validator agent, push, create PR
5757

5858
Cross-link all PRs in their bodies.

0 commit comments

Comments
 (0)