메뉴
Use when implementation is complete, tests have passed, and the integration path must be chosen. Presents and executes structured options for finishing a development branch.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
| name | finishing-a-development-branch |
| description | Use when implementation is complete, tests have passed, and the integration path must be chosen. Presents and executes structured options for finishing a development branch. |
| calls | ["soft:using-git-worktrees"] |
| compatibility | ["Python 3.11+ standard library"] |
Guide the completion of development work with clear options and handle the selected workflow.
Core principle: test verification -> present options -> execute the selection -> cleanup.
Announcement at start: "I'm using the finishing-a-development-branch skill to complete this work."
Verify that tests pass before presenting options:
# Run the project test suite
npm test / cargo test / pytest / go test ./...
When tests fail:
Tests failing (<N> failures). Must fix before completing:
[Show failures]
Cannot proceed with merge/PR until tests pass.
Stop. Do not proceed to Step 2.
When tests pass: proceed to Step 2.
# Try the common base branch
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
Or ask: "This branch split from main - is that correct?"
Present exactly the following 4 options:
Implementation complete. What would you like to do?
1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work
Which option?
Do not add explanation. Keep the options concise.
# Switch to the base branch
git checkout <base-branch>
# Pull the latest state
git pull
# Merge the feature branch
git merge <feature-branch>
# Verify tests on the merge result
<test command>
# When tests pass
git branch -d <feature-branch>
After that: clean up the worktree (Step 5)
# Push the branch
git push -u origin <feature-branch>
# Create the PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>
## Test Plan
- [ ] <verification steps>
EOF
)"
After that: clean up the worktree (Step 5)
Report: "Keeping branch . Worktree preserved at ."
Do not clean up the worktree.
Confirm first:
This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>
Type 'discard' to confirm.
Wait for the exact confirmation.
On confirmation:
git checkout <base-branch>
git branch -D <feature-branch>
After that: clean up the worktree (Step 5)
For options 1, 2, and 4:
Check whether you are in a worktree:
git worktree list | grep $(git branch --show-current)
If so:
git worktree remove <worktree-path>
For option 3: keep the worktree.
| Option | Merge | Push | Keep worktree | Clean up branch |
|---|---|---|---|---|
| 1. Local merge | ✓ | - | - | ✓ |
| 2. Create PR | - | ✓ | ✓ | - |
| 3. Keep as-is | - | - | ✓ | - |
| 4. Discard | - | - | - | ✓ (forced) |
Skipping test verification
Open questions
Automatic worktree cleanup
No discard confirmation
Never:
Always:
Called by:
Pairs with:
Update the per-session intent ledger for every user input and provide current intent as semantic context consumed by gates, skill-evolution, and jailbreak-detector. Keep intent summaries without storing raw prompts.
Use when the user asks about skill upgrades, update recommendations, or an evolution backlog; analyze io-trace and conduct_feedback to produce report-only evolution candidates. No automatic edits.
Use when an implementation plan already exists. Execute it in a separate session with review checkpoints.
Use when implementing a known feature, bug fix, or refactor with a resolved behavior contract. Requires a failing test before production code; use discovery first when the target or premise is unknown.
Use at the start of every coding or development conversation. Defines how to find and invoke coding-convention family skills. Requires relevant skills before any response, including clarification questions.
Runs after session-intent-analyzer and jailbreak-detector/downstream gate as their consumer. Decomposes the request and routes output, verification, lifecycle, and boundary skills without owning intake, raw intent inference, or tool permission.