merge

merge is a skill for Claude Code from RockyHong/super-bootstrap. It costs 57 tokens per session (1,340 once invoked), scanned A, original, MIT.

A Git branch-integration workflow that brings one or more feature branches into a base branch, choosing merge or rebase for each one.

In plain words
What is it for?
Use it to inspect unmerged branches, review their changes, and merge or rebase them into the base branch.
Why use it?
It provides a controlled way to combine separate lines of development and stops safely when files conflict. Conflict resolution is left to a designated agent or the user.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin. Also seen: mentions CLAUDE.md; mentions subagents.

Part of the super-bootstrap plugin — 13 skills, 7 agents shipped together

Good fit Use it to inspect unmerged branches, review their changes, and merge or rebase them into the base branch.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/rockyhong/super-bootstrap/merge
Install

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.

Any agent
npx skills add RockyHong/super-bootstrap --skill merge
Clone the repo
git clone --depth 1 https://github.com/RockyHong/super-bootstrap

Made for: Claude Code.

Or install super-bootstrap, the plugin that ships this one along with the rest of its 13 skills, 7 agents.

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.

agentmods badge for merge

README.md
[![agentmods](https://agentmods.dev/badge/skills/rockyhong/super-bootstrap/merge.svg)](https://agentmods.dev/skills/rockyhong/super-bootstrap/merge)
Your own site
<a href="https://agentmods.dev/skills/rockyhong/super-bootstrap/merge"><img src="https://agentmods.dev/badge/skills/rockyhong/super-bootstrap/merge.svg" alt="Measured on agentmods" height="20"></a>
Per session 57 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,340 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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00057 $0.01340
Opus 5 $0.00028 $0.00670
Sonnet 5 $0.00011 $0.00268
Haiku 4.5 $0.00006 $0.00134

Measured 8d ago against content hash e08680a92b29, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-08, from the pricing page.

Security

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 8d 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.

plugins/super-bootstrap/skills/merge/SKILL.md · 127 lines

How it starts

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

merge — Branch Absorption

Absorb feature branches into the base branch. Per-branch rebase-vs-merge recommendation, mechanical execution. Conflict resolution is NOT this skill's job — abort, surface, stop.

Branch Absorption Lane (load-bearing)

Branch integration is a topology operation on the commit graph. Route through the merge tool — git merge, this skill, or worker-direct-merge. File extension is not a routing signal; a docs-only branch is still branch integration.

Pre-flight when integration is in scope

Triggers: branch named for absorption, current branch behind base, worker returned with branch unmerged.

  1. git branch --no-merged <base> — list unmerged tips.
  2. For any file slated for edit: git log <base>..<branch> -- <path>. Non-empty → merge lane.
  3. To inspect merge state, materialize it: git merge --no-commit --no-ff <branch>, then git merge --abort. Read git diff <base>..<branch> for review only, never as input to a hand-applied edit across base.

Conflict Doctrine (load-bearing)

When git merge or git rebase produces conflicts:

  1. Abort immediatelygit merge --abort (for merge) or git rebase --abort (for rebase). Restore the working tree.
  2. Surface, don't resolve. Output the branch name, the conflict file list (git diff --name-only --diff-filter=U captured BEFORE abort), and which strategy hit the conflict.
  3. Stop the run. Do not attempt resolution — resolution never runs inside this skill. The step-2 surface is the conflict scope. Route it: if the consuming repo's harness names a conflict-resolution agent (its CLAUDE.md or agent roster — e.g. a builder/implementer agent), offer dispatching that agent with the conflict scope as the recommended next step; otherwise the user resolves manually or re-dispatches with a different strategy.

This rule applies to every branch in the queue. If branch A conflicts, abort A, surface, then continue with branches B, C — they're independent attempts. Don't skip them silently.

Read the full file on GitHub · 127 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.

  1. 8d ago First seen · 127 lines · 57 tokens per session scan A e08680a92b29

Subscribe to this mod's changes

merge is a skill published in the GitHub repository RockyHong/super-bootstrap (3 stars, last pushed 3d ago), licensed MIT. It adds 57 tokens to every session and 1,340 once invoked, about $0.0003 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.

Related

Other skills, from other repositories

ln-63-release-publisher

Prepares and publishes an explicitly requested tagged GitHub release. Not for ordinary commits, package publication, or announcements.

levnikolaevich/claude-code-skills · 30 tokens

ln-64-community-announcer

Drafts or publishes fact-checked GitHub Discussions announcements for project updates. Not for release creation or issue responses.

levnikolaevich/claude-code-skills · 30 tokens

atomic-git-discipline

Compressed commit message and PR body generator. Cuts noise from both while preserving intent and reasoning. Conventional Commits format. Subject ≤50 chars, body only when "why" isn't obvious; PR bodies state only what the diff can't show, 120 words max. Use when user says "write a commit", "commit message", "generate…

damusix/atomic-claude · 106 tokens

github-pr-merge

Merges GitHub Pull Requests after validating pre-merge checklist. Use when user wants to merge PR, close PR, finalize PR, complete merge, approve and merge, or execute merge. Runs pre-merge validation (tests, lint, CI, comments), confirms with user, merges with proper format, handles post-merge cleanup.

fvadicamo/dev-agent-skills · 72 tokens

github-pr-creation

Creates GitHub Pull Requests with automated validation and task tracking. Use when user wants to create PR, open pull request, submit for review, or check if ready for PR. Analyzes commits, validates task completion, generates Conventional Commits title and description, suggests labels. NOTE - for merging existing…

fvadicamo/dev-agent-skills · 75 tokens

git-commit

Creates git commits following Conventional Commits format with type/scope/subject. Use when user wants to commit changes, create commit, save work, or stage and commit. Enforces project-specific conventions from CLAUDE.md.

fvadicamo/dev-agent-skills · 49 tokens