ase-repo-resolve SKILL.md skillA
ase-repo-resolve from rse/ase is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add rse/ase/ase-repo-resolve@git:20260929.9fd59a8Pins git:20260929.9fd59a8 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- rse/ase
- Path
plugin/skills/ase-repo-resolve/SKILL.md- Versions recorded
- 1
- Latest version
- git:20260929.9fd59a8, committed Sep 29, 2026
- Size
- 5,698 bytes
- Repository stars
- 62
- License
- Apache-2.0
Resolve the Git merge conflicts of a working directory -- of an in-progress merge, rebase, cherry-pick, revert, stash apply, or of conflict markers left by patch -- carefully and semantically, never losing any change, escalate unresolvable hunks as-is, continue the in-progress operation, and emit a RESOLVED, PARTIAL, NONE, or FAILED verdict. Use when the user calls to "resolve" or "fix" merge conflicts.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
@${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
<purpose name="ase-repo-resolve">
Resolve Merge Conflicts
</purpose>
<expand name="getopt"
arg1="ase-repo-resolve"
arg2="--dir|-d=. --safe|-s --interactive|-i">
$ARGUMENTS
</expand>
<objective>
*Resolve* the merge conflicts of the working directory *semantically*,
*never* losing any change, *escalate* the unresolvable hunks as-is,
*continue* the in-progress operation, and report the *resolve verdict*.
</objective>
@${CLAUDE_SKILL_DIR}/../../meta/ase-common-resolve.md
Procedure
---------
<flow>
1. <step id="STEP 1: Resolve Conflicts">
1. Set <paths/> to <getopt-arguments/> with any leading and
trailing whitespace stripped. Do not output anything.
2. Resolve the conflicts by expanding the following:
<expand name="resolve-conflicts"
arg1="ase-repo-resolve"
arg2="<getopt-option-dir/>"
arg3="<getopt-option-interactive/>"
arg4="<getopt-option-safe/>"
arg5="<paths/>"></expand>
…Read the whole file at its exact version.
How to install
mdr add rse/ase/ase-repo-resolve@sha256:6ffaa5dd9503776dThe line at the top of this page pins the label git:20260929.9fd59a8, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_cbuvnhklqwmjow4i)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Sep 29, 2026.
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (5698 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
rse/ase · 62 stars · license Apache-2.0 · pushed 2026-11-04 · branch master
API
GET https://markdownregistry.com/api/v1/artifacts/art_cbuvnhklqwmjow4i GET https://markdownregistry.com/api/v1/resolve?ref=rse/ase/ase-repo-resolve GET https://markdownregistry.com/api/v1/blob/6ffaa5dd9503776dbdec995a005d52334513b2c458de6a9e32acc0da01913ccd
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.