resolve-conflicts SKILL.md skillA

resolve-conflicts from domengabrovsek/agent-config is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

Install it, pinned
mdr add domengabrovsek/agent-config/resolve-conflicts@git:20260829.3551d02

Pins git:20260829.3551d02 in mdr.lock. Pin the fingerprint instead.

Audit grade
A, 17 of 17 checks passed
Kind
SKILL.md skill
Repository
domengabrovsek/agent-config
Path
skills/resolve-conflicts/SKILL.md
Versions recorded
1
Latest version
git:20260829.3551d02, committed Aug 29, 2026
Size
1,218 bytes
Repository stars
23
License
none declared

Resolves an in-progress git merge or rebase conflict by recovering each side's intent from commits, PRs, and issues. Use when a merge or rebase stops on conflicts, or when the tree contains conflict markers.

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

> Source: [mattpocock/skills - engineering/resolving-merge-conflicts](https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts)

1. **See the current state** of the merge or rebase. Check git history and the conflicting files.

2. **Find the primary sources** for each conflict. Understand why each change was made and what the original intent was. Read the commit messages, check the PRs, check the original issues or 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. Resolve by default; reach for `--abort` only when the user asks for it.

4. **Run the quality gate.** Use `/verify-done` to discover and run the project's checks. Fix anything the merge broke.

5. **Finish the merge or rebase.** Stage everything and commit. If rebasing, continue 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_qgzqcjm5jm4ykbua/a24f52c5cd4f034e6402de8550c88815354bba0d7149c06509c22a20c0a78a84.json

Then /plugin install resolve-conflicts@markdownregistry-qgzqcjm5jm4ykbua in Claude Code. It installs git:20260829.3551d02, the one graded A here, pinned to the commit it was graded at, and leaves it there.

The exact contents, by fingerprint
mdr add domengabrovsek/agent-config/resolve-conflicts@sha256:a24f52c5cd4f034e

The line at the top of this page pins the label git:20260829.3551d02, 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_qgzqcjm5jm4ykbua.svg)](https://markdownregistry.com/a/art_qgzqcjm5jm4ykbua)

2 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 domengabrovsek/agent-config/resolve-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 resolve-conflicts from somewhere else? Ask it: where did my resolve-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 29, 2026.

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

versioncommittedcommitsizeaudit
git:20260829.3551d02 latest2026-08-29 3551d02 1,218 BA view
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 (1218 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

domengabrovsek/agent-config · 23 stars · license none declared · pushed 2026-11-17 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_qgzqcjm5jm4ykbua
GET https://markdownregistry.com/api/v1/resolve?ref=domengabrovsek/agent-config/resolve-conflicts
GET https://markdownregistry.com/api/v1/blob/a24f52c5cd4f034e6402de8550c88815354bba0d7149c06509c22a20c0a78a84

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 domengabrovsek/agent-config

AGENTS.md AGENTS.md file
domengabrovsek/agent-config · AGENTS.md
git:20261108.1d154ef · audit A · 23 stars
ci SKILL.md skill
domengabrovsek/agent-config · skills/ci/SKILL.md · Monitor the CI pipeline for the current branch via a background Monitor script (GitHub or GitLab), reacting to pass…
git:20261115.ca05047 · audit A · 23 stars
constraints SKILL.md skill
domengabrovsek/agent-config · skills/constraints/SKILL.md · Establishes a repo's quality bar as CONSTRAINTS.md: numbers with a command behind each, ratcheted so they never…
git:20260919.fb6ffd1 · audit A · 23 stars
debug SKILL.md skill
domengabrovsek/agent-config · skills/debug/SKILL.md · Runs a structured production-incident investigation that forces evidence-first hypothesis ranking before any code…
git:20261116.18a1a15 · audit A · 23 stars
deliver SKILL.md skill
domengabrovsek/agent-config · skills/deliver/SKILL.md · Deliver a feature end to end with one human gate: you approve the spec, then the agent plans, builds tests-first…
git:20261116.b96b2bc · audit A · 23 stars
diagram SKILL.md skill
domengabrovsek/agent-config · skills/diagram/SKILL.md · Creates or updates a drawio diagram per rules/diagrams.md, writing the source file and previewing via MCP. Falls back…
git:20261107.86f52fa · audit A · 23 stars
document SKILL.md skill
domengabrovsek/agent-config · skills/document/SKILL.md · Keeps a repo's technical docs accurate and consistent with the repo's own conventions. Checks the current diff against…
git:20260930.8396b2e · audit A · 23 stars
drive-fleet SKILL.md skill
domengabrovsek/agent-config · skills/drive-fleet/SKILL.md · Drives a fleet of MRs/PRs to done with a manager loop plus the built-in /goal command, delegating all edit, review…
git:20260923.fdc8a6d · audit A · 23 stars
fix-issue SKILL.md skill
domengabrovsek/agent-config · skills/fix-issue/SKILL.md · Investigates and fixes a GitHub issue. Use when given an issue number or URL, or when the user says 'fix issue'.
git:20261116.18a1a15 · audit A · 23 stars
grill-with-docs SKILL.md skill
domengabrovsek/agent-config · skills/grill-with-docs/SKILL.md · Runs a grilling session that challenges a plan against the existing domain model, sharpens terminology, and updates the…
git:20261116.18a1a15 · audit A · 23 stars
handoff SKILL.md skill
domengabrovsek/agent-config · skills/handoff/SKILL.md · Compacts the current conversation into a handoff document another agent can pick up. Use when the user says 'handoff'…
git:20261116.da5c75e · audit A · 23 stars
improve-codebase-architecture SKILL.md skill
domengabrovsek/agent-config · skills/improve-codebase-architecture/SKILL.md · Finds deepening opportunities in a codebase, informed by the domain language in CONTEXT.md and the decisions in…
git:20260829.2ef9a96 · audit A · 23 stars

Every file in domengabrovsek/agent-config

Other files named resolve-conflicts

resolve-conflicts SKILL.md skill
tailcallhq/forgecode · .forge/skills/resolve-conflicts/SKILL.md · Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve…
git:20251127.ee24908 · audit A · 7,634 stars
resolve-conflicts SKILL.md skill
haacked/dotfiles · ai/skills/resolve-conflicts/SKILL.md · Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked…
git:20260929.c582091 · audit A · 133 stars
resolve-conflicts SKILL.md skill
max-sixty/tend · plugins/tend-ci-runner/skills/resolve-conflicts/SKILL.md · Resolves merge conflicts on configured-bot PRs and, when requested, upstream dependency-bot PRs.
git:20260924.b3c4ba6 · audit A · 45 stars

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