resolving-merge-conflicts SKILL.md skillA
resolving-merge-conflicts from leek/agent-skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add leek/agent-skills/resolving-merge-conflicts@git:20261020.7c18a10Pins git:20261020.7c18a10 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- leek/agent-skills
- Path
skills/resolving-merge-conflicts/SKILL.md- Versions recorded
- 6
- Latest version
- git:20261020.7c18a10, committed Oct 20, 2026
- First version recorded
- Jul 31, 2026
- Size
- 1,845 bytes
- Repository stars
- 4
- License
- MIT
Resolve an in-progress git merge or rebase conflict while preserving both sides' intent. Use when a merge/rebase is blocked on conflicts, or the user asks to finish a conflicted merge or rebase.
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
# Resolving Merge Conflicts 1. **See the current state** of the merge/rebase. Check git history and the conflicting files. 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 original issues/tickets. 3. **Resolve each hunk.** Preserve both intents where possible. Where the two intents truly cannot both be kept, ask the user to choose instead of picking silently (`AskUserQuestion` where available: ours and theirs as options, plus a combined one if it makes sense, each hunk in its option's `preview`, the one matching the merge's stated goal first and marked recommended; otherwise quote both hunks in chat and ask). Do **not** invent new behaviour. Always resolve; never `--abort` unless the user explicitly asks to abort. …
Read the whole file at its exact version.
How to install
mdr add leek/agent-skills/resolving-merge-conflicts@sha256:601e0bcf7a7b17d9The line at the top of this page pins the label git:20261020.7c18a10, 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_ssztvmhkhbbpbrnp)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 6 versions of this file, between Jul 31, 2026 and Oct 20, 2026, about one every 16 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261020.7c18a10 latest | 2026-10-20 | 7c18a10 | 1,845 B | A | view · diff |
| git:20261020.d6396e8 | 2026-10-20 | d6396e8 | 1,427 B | A | view · diff |
| git:20261006.cae3ac3 | 2026-10-06 | cae3ac3 | 1,418 B | A | view · diff |
| git:20260831.64fb3ee | 2026-08-31 | 64fb3ee | 1,152 B | A | view · diff |
| git:20260809.23ec695 | 2026-08-09 | 23ec695 | 1,155 B | A | view · diff |
| git:20260731.50b3886 | 2026-07-31 | 50b3886 | 964 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 (1845 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
leek/agent-skills · 4 stars · license MIT · pushed 2026-10-20 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_ssztvmhkhbbpbrnp GET https://markdownregistry.com/api/v1/resolve?ref=leek/agent-skills/resolving-merge-conflicts GET https://markdownregistry.com/api/v1/blob/601e0bcf7a7b17d91dff67a4d0ea8adcc825ccd5d26f633d45a5fae7778ad255
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 leek/agent-skills
Every file in leek/agent-skills