Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx skills add julianobarbosa/claude-code-skills --skill mergegit clone --depth 1 https://github.com/julianobarbosa/claude-code-skillsWrote 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.
[](https://agentmods.dev/skills/julianobarbosa/claude-code-skills/merge)<a href="https://agentmods.dev/skills/julianobarbosa/claude-code-skills/merge"><img src="https://agentmods.dev/badge/skills/julianobarbosa/claude-code-skills/merge/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.
<a href="https://agentmods.dev/skills/julianobarbosa/claude-code-skills/merge"><img src="https://agentmods.dev/badge/skills/julianobarbosa/claude-code-skills/merge.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.00135 | $0.00900 |
| Opus 5.5 | $0.00054 | $0.00360 |
| Sonnet 5.5 | $0.00027 | $0.00180 |
| Haiku 4.5 | $0.00014 | $0.00090 |
Grade A, and why
merge 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 1mo 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.
How it starts
The opening of the file, as written. The whole thing — 47 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge
Combine merge-and-cleanup and merge-to-main into one flow. Default to fast-forward; preserve a merge commit when fast-forward isn't possible or the user asks for one. Always interactive about deleting branches and worktrees.
Flow
- Refuse if already on main. If
git rev-parse --abbrev-ref HEADreturnsmain(ormaster), stop and report — there's nothing to merge. - Working tree must be clean. If there are uncommitted changes, ask the user whether to commit, stash, or abort. Do not silently stash.
- Capture the feature branch name —
FEATURE=$(git rev-parse --abbrev-ref HEAD). - Sync main.
git checkout maingit pull --ff-only origin main
- Try fast-forward merge first.
git merge --ff-only "$FEATURE"- If it succeeds, history is linear — done with the merge step.
- If it fails (branch diverged), proceed to step 6.
- Fall back to merge commit —
git merge --no-ff "$FEATURE".- If there are conflicts, stop and report. Do not auto-resolve.
- Write a meaningful merge-commit message; do not accept the default if it's just "Merge branch …".
- Push —
git push origin main. - Interactive cleanup. Ask the user: "Delete
$FEATURE(local + remote) and any associated worktree?"- On yes:
- If a worktree exists for
$FEATURE(git worktree list | grep -F "$FEATURE"),cdto the main repo dir first, thengit worktree remove <path>. git branch -d "$FEATURE"(use-Donly if user explicitly confirms —-drefuses if branch isn't merged, which is the safety we want).git push origin --delete "$FEATURE"(ignore failure if branch was never pushed).
- If a worktree exists for
- On no: leave everything in place.
- On yes:
- Report final status — commit hash on main, whether branch was deleted, whether a worktree was removed.
Notes
- Prefer ff-only. Linear history is easier to reason about. Only fall back to a merge commit when the branch genuinely diverged.
- Never
--no-verify. If a pre-push hook fails, fix the underlying issue; don't bypass. - Worktree-first cleanup. If the feature branch was developed in a worktree, you cannot delete the branch from inside the worktree. Always
cdto the main repo working directory first. - Conflict policy. This skill does not auto-resolve conflicts. If
git mergereports a conflict, stop and surface it to the user — they decide.
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.
- 1mo ago First seen · 47 lines · 135 tokens per session scan A f9426f58e691
merge is a skill published in the GitHub repository julianobarbosa/claude-code-skills (14 stars, last pushed 11d ago), licensed MIT. It adds 135 tokens to every session and 900 once invoked, about $0.0005 per session on Opus 5.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.
Other skills, from other repositories
merge-batch
Prepare and merge an owner-selected PR batch with contributor credit and exact-candidate admission. Use for a pasted PR list; combined focused validation is diagnostic, and every actual landing still requires its applicable checks and authorization.
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
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.
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.
release-helper
Ensures configuration and code changes are released correctly. Use PROACTIVELY whenever you edit config.json, change any setting, or fix a configuration bug in this project, so the change reaches production.