What is ase-repo-merge?

A Git branch-merging workflow that combines a source branch with a target branch, including uncommitted changes. It can use a regular merge, a rebase with fast-forward, or a squash merge, then reports whether the merge succeeded or had conflicts.

Use it to merge branches, resolve conflicts based on the meaning of the code, check that the source branch reached the target, and return a MERGED, CONFLICT, or FAILED result.

It removes the need to handle branch checks, merge choices, conflict resolution, and post-merge verification manually.

ase-repo-merge — Skill for Claude Code by rse/ase

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 rse/ase --skill ase-repo-merge

Clone the repo

git clone --depth 1 https://github.com/rse/ase

Made for: Claude Code.

Or install ase, the plugin that ships this one along with the rest of its 57 skills, 10 agents, 5 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.

README.md

[![agentmods](https://agentmods.dev/badge/skills/rse/ase/ase-repo-merge/github.svg)](https://agentmods.dev/skills/rse/ase/ase-repo-merge)

Your own site

<a href="https://agentmods.dev/skills/rse/ase/ase-repo-merge"><img src="https://agentmods.dev/badge/skills/rse/ase/ase-repo-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.

Your own site · 80×15

<a href="https://agentmods.dev/skills/rse/ase/ase-repo-merge"><img src="https://agentmods.dev/badge/skills/rse/ase/ase-repo-merge.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

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

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

Security scan C 1 finding. 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.00087	$0.03854
Opus 5.5	$0.00035	$0.01542
Sonnet 5.5	$0.00017	$0.00771
Haiku 4.5	$0.00009	$0.00385

Measured 16d ago against content hash 65881678e832, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade C, and why

ase-repo-merge scanned grade C with 1 finding 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 16d 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.

Recursive force deletehighDestructive command

rm -rf with a variable or a broad path is one typo away from removing the wrong tree.

- "Bash(rm -rf *)"

plugin/skills/ase-repo-merge/SKILL.md · 347 lines

How it starts

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

@${CLAUDE_SKILL_DIR}/../../meta/ase-control.md @${CLAUDE_SKILL_DIR}/../../meta/ase-skill.md @${CLAUDE_SKILL_DIR}/../../meta/ase-getopt.md

$ARGUMENTS

@${CLAUDE_SKILL_DIR}/../../meta/ase-common-resolve.md

Then only output the following and then immediately STOP processing the entire current skill:

1. Set to empty, to false, and to false.
2. Set to with any leading and trailing whitespace stripped. If is empty or contains whitespace, expand the following:
3. Determine the checked-out branch by running the command git branch --show-current (taken exactly as given) and capturing its output into . If is current, set , otherwise set . If is empty (detached HEAD), expand the following:
4. For each of the branches and , run the command git rev-parse --verify --quiet "refs/heads/<branch/>" (with substituted). If it fails for a branch, expand the following:
5. Determine the worktrees by running the command git worktree list --porcelain (taken exactly as given). Set to the worktree path of the entry whose branch line is refs/heads/<source/> (or to empty if there is none), and set to the worktree path of the entry whose branch line is refs/heads/<target/> (or to empty if there is none). Do not output anything.
1. If is empty, skip this entire STEP 2, as a branch not checked out anywhere carries no uncommitted changes.
2. Run the command git -C "<source-dir/>" status --porcelain. If its output is empty, skip the remaining items of this STEP 2.
3. Stage all changes by running the command git -C "<source-dir/>" add --all, inspect them by running the command git -C "<source-dir/>" diff --cached, and craft a commit in the format <type/>: <summary/>, where is one of FEATURE, IMPROVEMENT, BUGFIX, UPDATE, CLEANUP, or REFACTOR and is a 60-80 character, imperative-mood summary without a trailing period, without Markdown formatting, and without any double-quote ("), backtick (`), dollar ($), or backslash (\) characters.

Read the full file on GitHub · 347 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

help.md 4.0 KB

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.

16d ago First seen · 347 lines · 87 tokens per session scan C 65881678e832

Subscribe to this mod's changes

ase-repo-merge is a skill published in the GitHub repository rse/ase (60 stars, last pushed yesterday), licensed Apache-2.0. It adds 87 tokens to every session and 3,854 once invoked, about $0.0003 per session on Opus 5.5. A static security scan graded it C with 1 finding (recursive force delete). No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-30.

Claude Code Git and workflow agentic-ai agentic-coding analyzing artificial-intelligence software-engineering

moai-workflow-worktree

Git worktree management for parallel SPEC development with isolated workspaces, automatic branch registration, and seamless MoAI-ADK integration. Use when setting up parallel development environments.

modu-ai/moai-adk · 41 tokens

moai-ref-git-workflow

Git workflow patterns, branch strategies, conventional commits, and PR templates reference for git operations. Agent-extending skill that amplifies manager-git expertise with production-grade git workflow patterns. NOT for: code implementation, testing, architecture design, documentation content.

modu-ai/moai-adk · 58 tokens

verify

Pre-commit verification entry point. Claude Code 2.1.286+ instructs the model to run a skill named verify right before committing (docs-only and tests-only commits exempt); this thin wrapper delegates that call to the MoAI quality gate instead of hand-rolling substitute checks.

modu-ai/moai-adk · 60 tokens

ase-repo-merge