resolving-merge-conflicts SKILL.md skillA
resolving-merge-conflicts from svyatov/supermatt is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add svyatov/supermatt/resolving-merge-conflicts@git:20261018.f19c25aPins git:20261018.f19c25a in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- svyatov/supermatt
- Path
skills/resolving-merge-conflicts/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261018.f19c25a, committed Oct 18, 2026
- First version recorded
- Sep 23, 2026
- Size
- 2,235 bytes
- Repository stars
- 22
- License
- MIT
Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted hunk, running the project's checks, and finishing the merge or rebase. Use when a merge, rebase, or pull stops on conflicts, or the user asks to resolve conflicts in an active merge or rebase. Not for standalone conflict-marker cleanup.
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
1. **See the current state** of the merge/rebase. Confirm that Git reports an active merge or rebase before editing or staging anything. If neither is active, stop and explain that standalone conflict-marker cleanup is ordinary editing outside this skill; do not create a merge commit or run a continuation command. Otherwise check git history and the conflicting files. Record the conflicted paths and existing unrelated staged, unstaged, and untracked work so it remains unchanged. 2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check the original issues. When there are many conflicts, hand this research to a sub-agent that returns only the intent of each side. 3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`. 4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke. …
Read the whole file at its exact version.
How to install
mdr add svyatov/supermatt/resolving-merge-conflicts@sha256:1d8dde7ba68c76e3The line at the top of this page pins the label git:20261018.f19c25a, 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_pmuivwl6nqtsgz3q)
6 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Sep 23, 2026 and Oct 18, 2026, about one every 6 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261018.f19c25a latest | 2026-10-18 | f19c25a | 2,235 B | A | view · diff |
| git:20260923.0e85035 | 2026-09-23 | 0e85035 | 1,299 B | A | view · diff |
| git:20260923.f93b34b | 2026-09-23 | f93b34b | 1,303 B | A | view · diff |
| git:20260923.cbcf853 | 2026-09-23 | cbcf853 | 1,195 B | A | view · diff |
| git:20260923.ac06581 | 2026-09-23 | ac06581 | 1,182 B | A | view |
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 (2235 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
svyatov/supermatt · 22 stars · license MIT · pushed 2026-10-28 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_pmuivwl6nqtsgz3q GET https://markdownregistry.com/api/v1/resolve?ref=svyatov/supermatt/resolving-merge-conflicts GET https://markdownregistry.com/api/v1/blob/1d8dde7ba68c76e3d6f6d187da785f2348713a1342c6d87e3ce3c625f14b0f33
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 svyatov/supermatt
Every file in svyatov/supermatt