ase-repo-resolve

ase-repo-resolve is a skill for Claude Code from rse/ase. It costs 99 tokens per session (1,500 once invoked), scanned C, original, Apache-2.0.

A Git conflict-resolution workflow for an unfinished merge, rebase, cherry-pick, revert, stash application, or patch. It resolves conflicts, checks for remaining unmerged files, and continues the operation when possible.

In plain words
What is it for?
Use it to resolve conflict markers and Git conflict states without losing either side's changes, while leaving unresolvable conflicts clearly identified.
Why use it?
It removes the need to manually find every conflict and decide whether the interrupted Git operation can safely continue.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter.

Part of the ase plugin — 57 skills, 10 agents, 5 hooks shipped together

Good fit Use it to resolve conflict markers and Git conflict states without losing either side's changes, while leaving unresolvable conflicts clearly identified.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/rse/ase/ase-repo-resolve
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-resolve
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.

agentmods badge for ase-repo-resolve

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/rse/ase/ase-repo-resolve"><img src="https://agentmods.dev/badge/skills/rse/ase/ase-repo-resolve.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 99 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,500 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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00099 $0.01500
Opus 5.5 $0.00040 $0.00600
Sonnet 5.5 $0.00020 $0.00300
Haiku 4.5 $0.00010 $0.00150

Measured 16d ago against content hash 6ffaa5dd9503, 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-resolve 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-resolve/SKILL.md · 159 lines

How it starts

The opening of the file, as written. The whole thing — 159 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-dialog.md @${CLAUDE_SKILL_DIR}/../../meta/ase-getopt.md

$ARGUMENTS

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

Procedure

    1. Set to with any leading and trailing whitespace stripped. Do not output anything.

    2. Resolve the conflicts by expanding the following:

    1. If is not RESOLVED or is none, skip this entire STEP 2, as either conflicts remain or there is no operation to continue (e.g., after git stash apply or patch --merge).

    2. Run the command git -C "<repo-root/>" diff --name-only --diff-filter=U. If its output is not empty (unmerged files outside of remain), only output the following and skip the remaining items of this STEP 2:

    3. Continue the operation by running the command git -C "<repo-root/>" -c core.editor=true <resolve-operation/> --continue, which keeps the prepared commit message without opening an editor.

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

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. 16d ago First seen · 159 lines · 99 tokens per session scan C 6ffaa5dd9503

Subscribe to this mod's changes

ase-repo-resolve is a skill published in the GitHub repository rse/ase (60 stars, last pushed yesterday), licensed Apache-2.0. It adds 99 tokens to every session and 1,500 once invoked, about $0.0004 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.

Related

Other skills, from other repositories