merge

merge is a skill for Claude Code, Codex from raine/workmux. It costs 13 tokens per session (604 once invoked), scanned A, original, MIT.

A workflow for finishing the current code branch by committing changes, rebasing onto its base branch, and merging it with workmux. Rebasing reapplies the branch's commits on top of the latest local base branch.

In plain words
What is it for?
Use it when the work on a branch is complete and you need to commit changes, rebase locally, and merge the branch.
Why use it?
It organizes the final integration steps and includes checks for uncommitted changes, staged review, and the branch's configured base. This reduces manual work before merging.

Skill for Claude CodeCodex

Part of the workmux-status plugin — 6 skills, 23 commands, 2 hooks shipped together

About the project

Workmux is a terminal tool that combines Git worktrees with tmux windows to create isolated environments for parallel development tasks. Developers use it to run multiple branches, editors, development servers, and AI agents at the same time, while the catalogue entries provide commands, skills, hooks, settings, and a plugin for that workflow.

raine/workmux · 2,365 stars · on GitHub

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.

agentmods
npx agentmods add skills/raine/workmux/merge
Any agent
npx skills add raine/workmux --skill merge
Clone the repo
git clone --depth 1 https://github.com/raine/workmux

Made for: Claude Code, Codex.

Or install workmux-status, the plugin that ships this one along with the rest of its 6 skills, 23 commands, 2 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

README.md
[![agentmods](https://agentmods.dev/badge/skills/raine/workmux/merge.svg)](https://agentmods.dev/skills/raine/workmux/merge)
Your own site
<a href="https://agentmods.dev/skills/raine/workmux/merge"><img src="https://agentmods.dev/badge/skills/raine/workmux/merge.svg" alt="Measured on agentmods" height="20"></a>
Per session 13 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 604 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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 $0.00013 $0.00604
Opus 5 $0.00006 $0.00302
Sonnet 5 $0.00003 $0.00121
Haiku 4.5 $0.00001 $0.00060

Measured 5d ago against content hash 830634722ff5, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, 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 5d 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.

skills/merge/SKILL.md · 73 lines

How it starts

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

Arguments: $ARGUMENTS

Check the arguments for flags:

  • --keep, -k → pass --keep to workmux merge (keeps the worktree and tmux window after merging)
  • --no-verify, -n → pass --no-verify to workmux merge

Strip all flags from arguments.

Commit, rebase, and merge the current branch.

This command finishes work on the current branch by:

  1. Committing all uncommitted changes
  2. Rebasing onto the base branch
  3. Running workmux merge to merge and clean up

Step 1: Commit

Check for staged, unstaged, and untracked changes with git status --porcelain. If there are changes, stage all of them with git add -A, review the staged diff, and commit. Use lowercase, imperative mood, no conventional commit prefixes. Skip if the working tree is clean.

Step 2: Rebase

Get the base branch from git config:

git config --local --get "branch.$(git branch --show-current).workmux-base"

If no base branch is configured, default to "main".

Rebase onto the local base branch (do NOT fetch from origin first):

git rebase <base-branch>

IMPORTANT: Do NOT run git fetch. Do NOT rebase onto origin/<branch>. Only rebase onto the local branch name (e.g., git rebase main, not git rebase origin/main).

If conflicts occur:

  • BEFORE resolving any conflict, understand what changes were made to each conflicting file in the base branch
  • For each conflicting file, run git log -p -n 3 <base-branch> -- <file> to see recent changes to that file in the base branch
  • The goal is to preserve BOTH the changes from the base branch AND our branch's changes
  • After resolving each conflict, stage the file and continue with git rebase --continue
  • If a conflict is too complex or unclear, ask for guidance before proceeding

Step 3: Merge

Run: workmux merge --rebase --notification [--keep] [--no-verify]

Include --keep only if the --keep flag was passed in arguments. Include --no-verify only if the --no-verify flag was passed in arguments.

Read the full file on GitHub · 73 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. 5d ago First seen · 73 lines · 13 tokens per session scan A 830634722ff5

Subscribe to this mod's changes

merge is a skill published in the GitHub repository raine/workmux (2,365 stars, last pushed yesterday), licensed MIT. It adds 13 tokens to every session and 604 once invoked, about $0.0001 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-30.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens