What is finish-branch?

A workflow for deciding what to do with a completed Git branch after its tests pass. Git branches are separate lines of code changes that can later be merged or shared.

Use it after implementation to run tests, identify the base branch, detect linked worktrees, and choose whether to merge, open a pull request, keep the branch, or discard it.

It prevents unfinished or failing work from being merged, published, or discarded, and checks which branch should receive the changes.

How nicograef/handbook configures Claude Code

Reuse

Borrowing it

Nothing to install: this file belongs to nicograef/handbook. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file

curl -O https://raw.githubusercontent.com/nicograef/handbook/main/.claude/skills/finish-branch/SKILL.md

Clone the repo

git clone --depth 1 https://github.com/nicograef/handbook

Made for: Claude Code.

Or install handbook, the plugin that ships this one along with the rest of its 23 skills, 1 agent, 1 hook.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/skills/nicograef/handbook/finish-branch/github.svg)](https://agentmods.dev/skills/nicograef/handbook/finish-branch)

Your own site

<a href="https://agentmods.dev/skills/nicograef/handbook/finish-branch"><img src="https://agentmods.dev/badge/skills/nicograef/handbook/finish-branch/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/skills/nicograef/handbook/finish-branch"><img src="https://agentmods.dev/badge/skills/nicograef/handbook/finish-branch.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 47 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 1,411 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

Origin original No closer match found in the catalogue.

Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

Model	Per session	Once invoked
Fable 5.1	$0.00047	$0.01411
Opus 5	$0.00023	$0.00705
Sonnet 5	$0.00009	$0.00282
Haiku 4.5	$0.00005	$0.00141

Measured 7d ago against content hash 89714ee12245, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-10, from the pricing page.

Security

Grade A, and why

finish-branch scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 7d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude/skills/finish-branch/SKILL.md · 117 lines

How it starts

The opening of the file, as written. The whole thing — 117 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Finish Branch

Adapted from the MIT-licensed superpowers plugin.

Workflow

Run the project's test command. Use make test if the repo has a Makefile.
- Otherwise the language-appropriate default (go test ./..., pnpm test, mvn test).
- Tests fail — stop. Report the failures and present no options.
- Tests pass — continue.
Determine the base branch. Detect the repo's default branch rather than assuming main:
```
git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null   # e.g. origin/main
gh repo view --json defaultBranchRef -q .defaultBranchRef.name  # fallback
```
- Strip the origin/ prefix for the local branch name.
- Neither resolves — try git merge-base against each long-lived branch in git branch --list; the nearest ancestor is the base.
- Two candidates tie, or none is an ancestor: ask, per the ask gate.
Detect whether the branch lives in a linked worktree, per using-git-worktrees steps 1-2.
Check for concurrent sessions before offering to integrate.
```
~/.claude/agent-bus.sh radar
```
- A peer session working in this repo makes landing a coordination step, not a local one — see ../parallel-sessions/SKILL.md.
- Settle the landing order over the bus first, then continue.

Present exactly these four options — no open-ended "what next?":

Tests pass. What would you like to do with this branch?

1. Merge back to <base-branch> locally
2. Push and open a Pull Request
3. Keep the branch as-is
4. Discard this work

Execute the chosen option only:
- Option 1, merge locally (plain checkout) — checkout <base-branch>, git pull, merge the feature branch.
- Re-run the test command on the merged result.
- Delete the feature branch (git branch -d <feature-branch>) only after the merge and tests succeed.
- Option 1, merge locally (linked worktree) — run the merge from the main checkout instead.
- Derive it from the first git worktree list --porcelain record, always the main worktree.
- Not from dirname of the git-common-dir: that resolves to a non-working-tree in a bare-hosted repo (verified at git 2.47.3).

Read the full file on GitHub · 117 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

7d ago Changed · -9 lines 89714ee12245
10d ago First seen · 126 lines · 47 tokens per session scan A 7f0ea913d05d

Subscribe to this mod's changes

finish-branch is a skill published in the GitHub repository nicograef/handbook (2 stars, last pushed yesterday), licensed MIT. It adds 47 tokens to every session and 1,411 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Git and workflow

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

changelog-composer

Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".

Mathews-Tom/armory · 67 tokens

re0-merge

Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…

LilMGenius/paperthin · 70 tokens

handbook: Skill for Claude Code