resolve SKILL.md skillA
resolve from gufranco/claude-engineering-rules is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add gufranco/claude-engineering-rules/resolve@git:20261013.7233f74Pins git:20261013.7233f74 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- gufranco/claude-engineering-rules
- Path
skills/resolve/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261013.7233f74, committed Oct 13, 2026
- First version recorded
- Apr 4, 2026
- Size
- 8,097 bytes
- Repository stars
- 3
- License
- MIT
Guided merge conflict resolution with verification. Shows each conflict with context from both branches, suggests resolution based on understanding both changes, verifies tests pass after resolution, and checks that no functionality was lost. Use when user says "resolve conflicts", "merge conflict", "fix conflicts", "rebase failed", "conflict resolution", or has merge conflicts to resolve. Use only when a merge or rebase has stopped on conflicts; for general debugging, use /investigate; for…
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
## Overview Interactive conflict resolution that understands the intent behind each side of a conflict. Resolves conflicts one at a time with test verification after all conflicts are resolved. ## When to Use - A merge, rebase, or cherry-pick stopped on conflicts and `git status` lists unmerged paths. - The user says "resolve conflicts", "merge conflict", "fix conflicts", "rebase failed", or "conflict resolution". For test failures with no conflict in progress, use `/investigate`; for reviewing the merged result, use `/review`. ## Arguments - No arguments: detect and resolve conflicts in the current working tree. ## Process ### Step 1: Detect conflict state Run `git status` to find all conflicted files. If no conflicts exist, check whether a rebase or merge is in progress: ``` git status git rev-parse -q --verify MERGE_HEAD git rev-parse -q --verify CHERRY_PICK_HEAD test -d "$(git rev-parse --git-path rebase-merge)" || test -d "$(git rev-parse --git-path rebase-apply)" ``` Ask git for these paths instead of reading `.git/` directly. In a linked worktree `.git` is a file, not a directory, so `.git/MERGE_HEAD` never exists there and an in-progress merge reads as absent. …
Read the whole file at its exact version.
How to install
mdr add gufranco/claude-engineering-rules/resolve@sha256:a6f0663876c460ecThe line at the top of this page pins the label git:20261013.7233f74, 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_a46q72ta5y7yj3en)
1 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Apr 4, 2026 and Oct 13, 2026, about one every 48 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261013.7233f74 latest | 2026-10-13 | 7233f74 | 8,097 B | A | view · diff |
| git:20261012.d086513 | 2026-10-12 | d086513 | 7,095 B | A | view · diff |
| git:20260501.be7c4f7 | 2026-05-01 | be7c4f7 | 5,096 B | A | view · diff |
| git:20260405.0a6eeb2 | 2026-04-05 | 0a6eeb2 | 5,081 B | A | view · diff |
| git:20260404.b38d04f | 2026-04-04 | b38d04f | 5,084 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 (8097 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
gufranco/claude-engineering-rules · 3 stars · license MIT · pushed 2026-10-30 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_a46q72ta5y7yj3en GET https://markdownregistry.com/api/v1/resolve?ref=gufranco/claude-engineering-rules/resolve GET https://markdownregistry.com/api/v1/blob/a6f0663876c460ec7d25cf0c454269982aae88f14f3cda912a8e0d7261740646
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 gufranco/claude-engineering-rules
Every file in gufranco/claude-engineering-rules