resolve-conflicts-by-intent SKILL.md skillA
resolve-conflicts-by-intent from theonly1me/shadowclone is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add theonly1me/shadowclone/resolve-conflicts-by-intent@git:20261009.95ca1efPins git:20261009.95ca1ef in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- theonly1me/shadowclone
- Path
.agents/skills/resolve-conflicts-by-intent/SKILL.md- Versions recorded
- 1
- Latest version
- git:20261009.95ca1ef, committed Oct 9, 2026
- Size
- 3,099 bytes
- Repository stars
- 21
- License
- MIT
Use when Git reports conflicts during a merge, a rebase, or a cherry-pick. Also use it when the user says "fix the merge conflicts", "rebase onto main", or "the merge broke the build". Traces each side of a conflict to the change that it came from. Keeps both intents when they fit together, and asks when they do not. Then runs the checks on the combined result. Not for choosing what a new behavior should be (use `choose-by-consequence`).
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
# Resolve Conflicts by Intent ## Use when A merge, a rebase, or a cherry-pick stops with conflicted files. Each side of a conflict carries an intent. A correct resolution keeps each intent that still applies. ## Gates 1. For each conflicted file, can you name the commit and the intent behind each side? 2. Does the resolution keep both intents when they fit together? 3. When the intents do not fit together, did you ask the user instead of picking one? 4. Did you check related names and code outside the conflict markers? 5. Do the checks pass on the combined result, and did you separate failures that were already on a parent? 6. Are all conflict markers gone, with no file left unmerged? ## Process 1. Read the operation in progress, the conflicted paths, and the commits on each side. 2. For each side, read the commit message, the tests, and the design notes that explain it. 3. Resolve each conflict in the current design. Keep the compatible parts of both sides. 4. Search the rest of the code for names and assumptions that either side changed. 5. Run the focused checks and the required merge check. …
Read the whole file at its exact version.
How to install
mdr add theonly1me/shadowclone/resolve-conflicts-by-intent@sha256:977fb045e1425a87The line at the top of this page pins the label git:20261009.95ca1ef, 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_qh7howpurjscyw63)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Oct 9, 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 (3099 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
theonly1me/shadowclone · 21 stars · license MIT · pushed 2026-10-19 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_qh7howpurjscyw63 GET https://markdownregistry.com/api/v1/resolve?ref=theonly1me/shadowclone/resolve-conflicts-by-intent GET https://markdownregistry.com/api/v1/blob/977fb045e1425a87fdf8aa74ed77d9aa918bf291ec4e0c2b81a3c21ea2a5156d
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.
More from theonly1me/shadowclone
Every file in theonly1me/shadowclone