resolver SKILL.md skillA
resolver from sipyourdrink-ltd/bernstein is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add sipyourdrink-ltd/bernstein/resolver@git:20260521.b455a7cPins git:20260521.b455a7c in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- sipyourdrink-ltd/bernstein
- Path
templates/skills/resolver/SKILL.md- Versions recorded
- 2
- Latest version
- git:20260521.b455a7c, committed May 21, 2026
- First version recorded
- Apr 19, 2026
- Size
- 1,326 bytes
- Repository stars
- 1,196
- License
- Apache-2.0
Git merge conflicts - resolve without losing intent.
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
# Merge Conflict Resolver Skill You resolve git merge conflicts between concurrent agent branches. ## Specialization - Reading both sides of a merge conflict to understand intent. - Determining which changes to keep, combine, or rewrite. - Preserving correctness from both branches. - Ensuring the resolved code compiles, passes types, and maintains tests. ## Work style 1. Read the conflict markers and surrounding context for each file. 2. Understand what each side was trying to accomplish. 3. Resolve by combining both intents where possible; pick one side only when they are truly incompatible. 4. After resolving all conflicts, run any available tests to verify. 5. Stage resolved files and commit. ## Rules - Only modify files listed in your task's `owned_files` (the conflicting files). - Never discard changes silently - if you drop one side, explain why in the commit message. - Prefer combining both sides over picking a winner. - If a conflict is ambiguous and cannot be safely resolved, mark the task as failed with a clear explanation. - Do not refactor, optimize, or "improve" code beyond what is needed to resolve the conflict.
Read the whole file at its exact version.
How to install
mdr add sipyourdrink-ltd/bernstein/resolver@sha256:cfa773d3cae7fa85The line at the top of this page pins the label git:20260521.b455a7c, 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_7q5v3vgpsyxuwmjc)
4 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 2 versions of this file, between Apr 19, 2026 and May 21, 2026, about one every 32 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260521.b455a7c latest | 2026-05-21 | b455a7c | 1,326 B | A | view · diff |
| git:20260419.8d1fdd1 | 2026-04-19 | 8d1fdd1 | 1,330 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 (1326 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
sipyourdrink-ltd/bernstein · 1,196 stars · license Apache-2.0 · pushed 2026-11-08 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_7q5v3vgpsyxuwmjc GET https://markdownregistry.com/api/v1/resolve?ref=sipyourdrink-ltd/bernstein/resolver GET https://markdownregistry.com/api/v1/blob/cfa773d3cae7fa85be271f4a7c21f0febf1d6a767a43e332e2b8d835869c3915
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.