merge-up

merge-up is a skill for Claude Code from joris887/exosuit. It costs 95 tokens per session (1,199 once invoked), scanned A, original, MIT.

A workflow for merging committed work from a parallel Git worktree branch into its parent branch, then updating the parallel branch to match. A worktree is a separate working directory connected to the same Git repository.

In plain words
What is it for?
Use it after working in a parallel stream to merge that stream's commits into the parent branch and bring the stream up to date.
Why use it?
It handles the branch and worktree details that can make parallel development confusing. It also checks that the work is committed and asks before pushing the updated parent branch.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter. Also seen: names the AskUserQuestion tool.

Part of the exosuit plugin — 44 skills, 1 command, 9 agents, 10 hooks shipped together

Good fit Use it after working in a parallel stream to merge that stream's commits into the parent branch and bring the stream up to date.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/joris887/exosuit/merge-up
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 joris887/exosuit --skill merge-up
Clone the repo
git clone --depth 1 https://github.com/joris887/exosuit

Made for: Claude Code.

Or install exosuit, the plugin that ships this one along with the rest of its 44 skills, 1 command, 9 agents, 10 hooks.

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-up

README.md
[![agentmods](https://agentmods.dev/badge/skills/joris887/exosuit/merge-up/github.svg)](https://agentmods.dev/skills/joris887/exosuit/merge-up)
Your own site
<a href="https://agentmods.dev/skills/joris887/exosuit/merge-up"><img src="https://agentmods.dev/badge/skills/joris887/exosuit/merge-up/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.

agentmods 80×15 button for merge-up

Your own site · 80×15
<a href="https://agentmods.dev/skills/joris887/exosuit/merge-up"><img src="https://agentmods.dev/badge/skills/joris887/exosuit/merge-up.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 95 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,199 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.00095 $0.01199
Opus 5 $0.00048 $0.00600
Sonnet 5 $0.00019 $0.00240
Haiku 4.5 $0.00010 $0.00120

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

Security

Grade A, and why

merge-up 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 9d 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/merge-up/SKILL.md · 108 lines

How it starts

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


merge-up

Merge the current stream's branch into the parent it was created from, then fast-forward the current branch back up to the parent. Safe across worktrees: the parent is usually checked out in another worktree, so the merge runs there via git -C rather than checking the parent out here (git forbids that).

Step 1 — Identify branches

B="$(git rev-parse --abbrev-ref HEAD)"
echo "current branch: $B"
  • If B is HEAD (detached), STOP — tell the user to check out a branch.
  • Resolve the parent P:
    P="$(git config "branch.$B.exosuitParent" || true)"
    
    • If empty, fall back to stripping the last -<suffix> (e.g. sprint-3-asprint-3) and verify it exists with git show-ref --verify --quiet refs/heads/<cand>.
    • If still unresolved or ambiguous, ASK the user which branch is the parent.
  • If P == B or P doesn't exist, STOP and report.

Step 2 — Pre-flight cleanliness (both worktrees)

git status --porcelain            # current worktree — must be empty
  • If the current worktree is dirty, STOP: the skill merges committed work only. Tell the user to commit or stash first.
  • Locate the parent's worktree dir:
    git worktree list --porcelain
    
    Find the entry whose branch is refs/heads/$P; call its path PDIR.
    • If P is not checked out in any worktree, STOP and tell the user to check it out in a worktree first (the merge needs a working tree to run in).
  • Verify the parent worktree is clean: git -C "$PDIR" status --porcelain must be empty. If dirty, STOP and report which worktree/path needs attention.

Step 3 — Merge current branch into parent (true merge)

Run the merge in the parent's worktree:

git -C "$PDIR" merge "$B"
  • This keeps B's individual commits (fast-forwards when possible).
  • On "Already up to date." → nothing to merge; tell the user and SKIP to Step 5.
  • On conflict: run git -C "$PDIR" merge --abort, then STOP and report the conflicting files. Offer to help resolve, but do NOT leave the parent worktree in a half-merged state without telling the user.
  • On success, show git -C "$PDIR" log --oneline -3.

Read the full file on GitHub · 108 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. 9d ago First seen · 108 lines · 95 tokens per session scan A 354665bb6d96

Subscribe to this mod's changes

merge-up is a skill published in the GitHub repository joris887/exosuit (4 stars, last pushed 20d ago), licensed MIT. It adds 95 tokens to every session and 1,199 once invoked, about $0.0005 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