Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/omk-finishing .claude/skills/omk-finishing && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .claude/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishingType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/omk-finishing .agents/skills/omk-finishing && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .agents/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/omk-finishing .cursor/skills/omk-finishing && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .cursor/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/KaimingWan/oh-my-kiro.git --path skills/omk-finishing--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/omk-finishing .gemini/skills/omk-finishing && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .gemini/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install KaimingWan/oh-my-kiro omk-finishingInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/omk-finishing .github/skills/omk-finishing && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .github/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/omk-finishing .opencode/skills/omk-finishing && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "omk-finishing" agent skill from https://github.com/KaimingWan/oh-my-kiro/tree/main/skills/omk-finishing into .opencode/skills/omk-finishing/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "omk-finishing", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
omk-finishingBranch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.
Omk Finishing is an agent skill from KaimingWan/oh-my-kiro. Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree. Trigger when implementation is complete, all tests pass, user says 'done', 'finish', 'merge', 'create PR', 'push', 'wrap up', '@cpu', or when ready to integrate work back to main branch.
Its SKILL.md is about 1.1k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git worktrees and Pull requests. The licence is MIT.
5 steps, taken from the step headings in SKILL.md.
Read from SKILL.md and the folder at commit ba228be. It shows what the files ask for, not the result of running them.
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Shell commands in SKILL.md call:
gitnpmghFrom the folder's file list and the shell code blocks in SKILL.md.
No URLs in SKILL.md. Its commands use git, npm and gh, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Omk Finishing loads about 1.1k tokens when it runs. Until then it costs about 79 tokens; SKILL.md has 353 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
The full file from KaimingWan/oh-my-kiro at commit ba228be, republished under its MIT licence (© KaimingWan). 353 words, ~1,114 tokens.
.claude/skills/omk-finishing/SKILL.md (or your agent's skills folder).Guide completion of development work by presenting clear options and handling chosen workflow.
Core principle: Verify tests → Present options → Execute choice → Clean up.
Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."
Before presenting options, verify tests pass:
# Run project's test suite
npm test / cargo test / pytest / go test ./...If tests fail:
Tests failing (<N> failures). Must fix before completing:
[Show failures]
Cannot proceed with merge/PR until tests pass.Stop. Don't proceed to Step 2.
If tests pass: Continue to Step 2.
# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/nullOr ask: "This branch split from main - is that correct?"
Present exactly these 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?Don't add explanation - keep options concise.
# Switch to base branch
git checkout <base-branch>
# Pull latest
git pull
# Merge feature branch
git merge <feature-branch>
# Verify tests on merged result
<test command>
# If tests pass
git branch -d <feature-branch>Then: Cleanup worktree (Step 5)
# Push branch
git push -u origin <feature-branch>
# Create PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>
## Test Plan
- [ ] <verification steps>
EOF
)"Then: Cleanup worktree (Step 5)
Report: "Keeping branch <name>. Worktree preserved at <path>."
Don't cleanup worktree.
Confirm first:
This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>
Type 'discard' to confirm.Wait for exact confirmation.
If confirmed:
git checkout <base-branch>
git branch -D <feature-branch>Then: Cleanup worktree (Step 5)
For Options 1, 2, 4:
Check if in worktree:
git worktree list | grep $(git branch --show-current)If yes:
git worktree remove <worktree-path>For Option 3: Keep worktree.
| Option | Merge | Push | Keep Worktree | Cleanup Branch |
|---|---|---|---|---|
| 1. Merge locally | ✓ | - | - | ✓ |
| 2. Create PR | - | ✓ | ✓ | - |
| 3. Keep as-is | - | - | ✓ | - |
| 4. Discard | - | - | - | ✓ (force) |
Skipping test verification
Open-ended questions
Automatic worktree cleanup
No confirmation for discard
Never:
Always:
Called by:
Pairs with:
© KaimingWan, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Just SKILL.md in skills/omk-finishing of KaimingWan/oh-my-kiro.
Open the folder on GitHubat commit ba228be
Omk Finishing next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Omk Finishing this skillKaimingWan/oh-my-kiro | 107 | — | ~1.1k | Automated safety check: Pass | MIT | |
| Finishing a Development Branchobra/superpowers | 297k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Pre-Release PR Triagejamiepine/voicebox | 57k | — | ~3.1k | Automated safety check: Pass | MIT | |
| Cap Feature Building WorkflowCapSoftware/Cap | 23k | — | ~2.5k | Automated safety check: Warn | Custom licence | |
| Om Auto Fix Issuego-musicfox/go-musicfox | 2.6k | 1 repos | ~5k | Automated safety check: Notes | GPL-3.0 | |
| Codewhale Landing Workflowcodewhale-hq/Codewhale | 41k | — | ~1.6k | Automated safety check: Pass | MIT |
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
jamiepine/voicebox
Sorts a backlog of open pull requests into must-merge, candidate, superseded and deferred, writes a triage doc and works the merge loop before a release.
CapSoftware/Cap
Builds a Cap feature in an isolated Git worktree with disposable dev resources, verification, a recorded demo and a neutral pull request, started with /building.
go-musicfox/go-musicfox
Fix or implement a tracker issue end to end from a single command — takes an issue id or a plain problem description (filed first via om-prepare-issue), classifies, then drives the bug autofix chain…
codewhale-hq/Codewhale
Decides how verified work should reach main, directly, in a worktree or on an integration branch, while keeping contributor credit and respecting merge gates.
jtenniswood/espcontrol
Clean up completed Git branches and worktrees for this repository both locally and on GitHub.
KaimingWan/oh-my-kiro
Multi-level research: built-in knowledge → web search → Tavily deep research API.
KaimingWan/oh-my-kiro
Code and plan review with multi-angle dispatch. An agent skill from KaimingWan/oh-my-kiro.
KaimingWan/oh-my-kiro
Create high-quality, production-ready skills from scratch. An agent skill from KaimingWan/oh-my-kiro.
KaimingWan/oh-my-kiro
Extract and summarize YouTube video content via subtitle extraction.
KaimingWan/oh-my-kiro
Fetch current library/framework documentation via Context7. An agent skill from KaimingWan/oh-my-kiro.
KaimingWan/oh-my-kiro
Enforces coding best practices: deep-read before modify, LSP-first navigation, TDD red-green-refactor, minimal changes, self-review, verification.
Categories
Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree. Omk Finishing is an agent skill from KaimingWan/oh-my-kiro. Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.
Omk Finishing fits situations like: implementation is complete; ready to integrate work back to main branch.
Run `npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a claude-code`. Or copy the skill folder (skills/omk-finishing in KaimingWan/oh-my-kiro) into .claude/skills/omk-finishing in your project. Claude Code loads it when a task matches its description.
Run `npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a codex`. Or copy the skill folder (skills/omk-finishing in KaimingWan/oh-my-kiro) into .agents/skills/omk-finishing in your project. Codex loads it when a task matches its description.
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/omk-finishing, .gemini/skills/omk-finishing, .github/skills/omk-finishing and .opencode/skills/omk-finishing in your project.
Going by SKILL.md and its folder, Omk Finishing needs the command-line tools its instructions call (git, npm and gh).
SKILL.md contains no URLs. Its commands use git, npm and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
Omk Finishing is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
About 1.1k tokens (SKILL.md is roughly 4.5k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
Skills that share tags, products or a category with Omk Finishing: Finishing a Development Branch (obra/superpowers, 297k stars), Pre-Release PR Triage (jamiepine/voicebox, 57k stars), Cap Feature Building Workflow (CapSoftware/Cap, 23k stars) and Om Auto Fix Issue (go-musicfox/go-musicfox, 2.6k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
KaimingWan (a GitHub user) maintains it in KaimingWan/oh-my-kiro, which has 107 GitHub stars. The repository holds 15 skills in this directory. The repository was last updated on April 2, 2026.
Source: KaimingWan/oh-my-kiro on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.