resolving-merge-conflicts SKILL.md skillA

This file is byte-identical to the first copy the registry indexed, one of 9 indexed copies. Same content hash, so the same checks give both the same grade.

resolving-merge-conflicts from jacobstephens2/skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

Install it, pinned
mdr add jacobstephens2/skills/resolving-merge-conflicts@git:20260831.bf88be6

Pins git:20260831.bf88be6 in mdr.lock. Pin the fingerprint instead.

Audit grade
A, 17 of 17 checks passed
Kind
SKILL.md skill
Repository
jacobstephens2/skills
Path
.agents/skills/resolving-merge-conflicts/SKILL.md
Versions recorded
1
Latest version
git:20260831.bf88be6, committed Aug 31, 2026
Size
918 bytes
Repository stars
2
License
MIT

Use when you need to resolve an in-progress git merge/rebase conflict.

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. 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 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.

5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Read the whole file at its exact version.

How to install

No tool to install first
claude plugin marketplace add https://markdownregistry.com/mp/a/art_6vhut6rgyypcffvx/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0.json

Then /plugin install resolving-merge-conflicts@markdownregistry-6vhut6rgyypcffvx in Claude Code. It installs git:20260831.bf88be6, the one graded A here, pinned to the commit it was graded at, and leaves it there.

The exact contents, by fingerprint
mdr add jacobstephens2/skills/resolving-merge-conflicts@sha256:9d8114f8ef0b31f5

The line at the top of this page pins the label git:20260831.bf88be6, 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.

Badge

mdr badge

[![mdr](https://markdownregistry.com/badge/art_6vhut6rgyypcffvx.svg)](https://markdownregistry.com/a/art_6vhut6rgyypcffvx)

1 badge image fetches in 30 days. What the badge shows.

Ask from your agent
claude mcp add --transport http markdownregistry https://markdownregistry.com/mcp/registry

Then ask it: what changed in jacobstephens2/skills/resolving-merge-conflicts since the version I have? It reads every saved version here, no key and no account. Any agent that speaks MCP can add it.

Got a copy of resolving-merge-conflicts from somewhere else? Ask it: where did my resolving-merge-conflicts come from, and what was changed? It names the public original, the version yours is closest to and every changed line. The text is not kept.

Versions

The registry has recorded 1 version of this file, committed on Aug 31, 2026.

Watch this file (sign in, one email per new version)

versioncommittedcommitsizeaudit
git:20260831.bf88be6 latest2026-08-31 bf88be6 918 BA view

Copies

Copies in other repositories

6 files in 5 other repositories hold the exact bytes of one of this file's versions, each committed after this file had them: all of them hold the newest version.

A copy does not update when this file does. Whoever holds one can learn which version it is with the Check your copy box below, or by asking their agent. Matched on exact bytes and commit dates only.

Keep it current by itself, install once

Committed this skill to a repository? Install the markdownregistry skill updates app on it, or on all of them. When the registry saves a newer version, a pull request brings your copy to it within minutes, the newest version first, then what changed and any check it newly trips. A copy you edited is never touched, and nothing is deleted.

Install on GitHub

It asks to read and write contents and pull requests, and to read metadata. No workflow file, no Actions setting, nothing runs on your runners. Uninstall it and everything the registry kept about your repository is deleted.

Keep it current by itself

Committed this skill to a repository? Add one workflow file, and when a newer version is saved, a pull request brings your copy to it, the newest version first, then what changed and any check it newly trips. A copy you edited is never touched, and nothing is deleted.

mkdir -p .github/workflows && curl -fsSL https://markdownregistry.com/ci/skill-updates.yml -o .github/workflows/skill-updates.yml

It runs daily on GitHub Actions, no key and no account. Read the workflow before you add it.

Check a whole project

From the root of your project, one line hashes each installed skill's SKILL.md, your AGENTS.md and your CLAUDE.md, and asks the registry once. Only the fingerprints and paths are sent.

sha256sum .claude/skills/*/SKILL.md AGENTS.md CLAUDE.md | curl -s --data-binary @- https://markdownregistry.com/api/v1/check-copies

In CI, add --fail-with-body: the answer is 409 when any file is behind, so the step fails and still prints which files.

sha256sum .claude/skills/*/SKILL.md AGENTS.md CLAUDE.md | curl -s --fail-with-body --data-binary @- https://markdownregistry.com/api/v1/check-copies

No sha256sum on your machine? shasum -a 256 prints the same lines.

Audit of the latest version

A  17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.
  • pass: Frontmatter block present
  • pass: Frontmatter declares a name
  • pass: Frontmatter declares a description
  • pass: Size between 200 bytes and 200 KB (918 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

GitHub

jacobstephens2/skills · 2 stars · license MIT · pushed 2026-10-21 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_6vhut6rgyypcffvx
GET https://markdownregistry.com/api/v1/resolve?ref=jacobstephens2/skills/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0

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 jacobstephens2/skills

ask-matt SKILL.md skill
jacobstephens2/skills · .agents/skills/ask-matt/SKILL.md · Ask which skill or flow fits your situation. A router over the skills in this repo.
git:20260831.bf88be6 · audit A · 2 stars
code-review SKILL.md skill
jacobstephens2/skills · .agents/skills/code-review/SKILL.md · Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code…
git:20260831.bf88be6 · audit A · 2 stars
codebase-design SKILL.md skill
jacobstephens2/skills · .agents/skills/codebase-design/SKILL.md · Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find…
git:20260831.bf88be6 · audit A · 2 stars
diagnosing-bugs SKILL.md skill
jacobstephens2/skills · .agents/skills/diagnosing-bugs/SKILL.md · Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports…
git:20260831.bf88be6 · audit A · 2 stars
domain-modeling SKILL.md skill
jacobstephens2/skills · .agents/skills/domain-modeling/SKILL.md · Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a CONTEXT.md…
git:20260831.bf88be6 · audit A · 2 stars
grill-me SKILL.md skill
jacobstephens2/skills · .agents/skills/grill-me/SKILL.md · A relentless interview to sharpen a plan or design.
git:20260831.bf88be6 · audit B · 2 stars
grill-with-docs SKILL.md skill
jacobstephens2/skills · .agents/skills/grill-with-docs/SKILL.md · A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go.
git:20260831.bf88be6 · audit A · 2 stars
grilling SKILL.md skill
jacobstephens2/skills · .agents/skills/grilling/SKILL.md · Grill the user relentlessly about a plan, decision, or idea. Use when the user wants to stress-test their thinking, or…
git:20260831.bf88be6 · audit A · 2 stars
handoff SKILL.md skill
jacobstephens2/skills · .agents/skills/handoff/SKILL.md · Compact the current conversation into a handoff document for another agent to pick up.
git:20260831.bf88be6 · audit A · 2 stars
implement SKILL.md skill
jacobstephens2/skills · .agents/skills/implement/SKILL.md · Implement a piece of work based on a spec or set of tickets.
git:20260831.bf88be6 · audit A · 2 stars
improve-codebase-architecture SKILL.md skill
jacobstephens2/skills · .agents/skills/improve-codebase-architecture/SKILL.md · Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you…
git:20260831.bf88be6 · audit A · 2 stars
prototype SKILL.md skill
jacobstephens2/skills · .agents/skills/prototype/SKILL.md · Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model…
git:20260831.bf88be6 · audit A · 2 stars

Every file in jacobstephens2/skills

Other files named resolving-merge-conflicts

resolving-merge-conflicts SKILL.md skill
asymmetric-al/core · .agents/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20260923.15c9348 · audit A · 370 stars
resolving-merge-conflicts SKILL.md skill
romiluz13/cc10x · plugins/cc10x/skills/resolving-merge-conflicts/SKILL.md · Use when a git merge or rebase reports conflicts and the operation is in progress.
git:20260719.252ad11 · audit A · 168 stars
resolving-merge-conflicts SKILL.md skill
gtapps/hermitd · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20261002.2f2da1b · audit A · 85 stars
resolving-merge-conflicts SKILL.md skill
gtapps/claude-code-hermit · plugins/hermitd-dev/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20261002.2f2da1b · audit A · 85 stars
resolving-merge-conflicts SKILL.md skill
rudycity/superagent · .agents/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20260626.019dba9 · audit A · 71 stars
resolving-merge-conflicts SKILL.md skill
svyatov/supermatt · skills/resolving-merge-conflicts/SKILL.md · Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted…
git:20261018.f19c25a · audit A · 30 stars
resolving-merge-conflicts SKILL.md skill
vodailocz/kilo-kit-mcp · skills/engineering/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20260821.05c0d52 · audit A · 28 stars
resolving-merge-conflicts SKILL.md skill
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/git-github-tools/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
git:20260821.1b830a3 · audit A · 27 stars

Browse by kind, by grade A, or by owner.

Kept in .agents/skills, the folder Codex reads. More agent skills for Codex.