git:conflicts SKILL.md skillA
git:conflicts from bendrucker/claude is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add bendrucker/claude/git:conflicts@git:20261103.7d686ccPins git:20261103.7d686cc in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- bendrucker/claude
- Path
plugins/git/skills/conflicts/SKILL.md- Versions recorded
- 10
- Latest version
- git:20261103.7d686cc, committed Nov 3, 2026
- First version recorded
- Feb 16, 2026
- Size
- 3,248 bytes
- Repository stars
- 18
- License
- MIT
Resolve git merge conflicts from a rebase, merge, or cherry-pick. Use also for a request to finish the operation and push, such as "fix conflicts and push".
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
# Git Conflicts
## Status
!`bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/status.ts`
## Context
!`bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/context.ts`
## Upstream
!`bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/upstream.ts`
## Resolving
Resolve each conflicted file, then `git add` it.
- Regenerate a generated file, such as a lockfile or a build artifact, from its source. Follow the project's `CLAUDE.md` for lockfile guidance.
- When repeated rebases hit the same conflict, [references/rerere.md](references/rerere.md) records a resolution and replays it.
Resolving is done when every conflicted file is staged and `git diff --cached --check` reports no conflict markers. Leave the commit, the continue, and the push to the user.
## Completing the Operation
Take the operation past the staged resolution only when the user asks for it: the `--push` argument, its alias `push`, or a request such as "fix conflicts and push". Then:
1. When no rebase, merge, or cherry-pick is in progress and upstream has diverged, run `git merge origin/<default-branch>` to produce the conflicts. A clean merge goes straight to the push.
…Read the whole file at its exact version.
How to install
mdr add bendrucker/claude/git:conflicts@sha256:cbd236d7a3a157e9The line at the top of this page pins the label git:20261103.7d686cc, 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_52dkh6e2looe2ynb)
7 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 10 versions of this file, between Feb 16, 2026 and Nov 3, 2026, about one every 29 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261103.7d686cc latest | 2026-11-03 | 7d686cc | 3,248 B | A | view · diff |
| git:20261103.201859f | 2026-11-03 | 201859f | 3,688 B | A | view · diff |
| git:20261030.03f7155 | 2026-10-30 | 03f7155 | 3,939 B | A | view · diff |
| git:20260926.2d6862f | 2026-09-26 | 2d6862f | 4,433 B | A | view · diff |
| git:20260912.9a1c8e4 | 2026-09-12 | 9a1c8e4 | 4,420 B | A | view · diff |
| git:20260619.7c505c1 | 2026-06-19 | 7c505c1 | 3,732 B | A | view · diff |
| git:20260616.5b1e09b | 2026-06-16 | 5b1e09b | 3,684 B | A | view · diff |
| git:20260615.1ec44ee | 2026-06-15 | 1ec44ee | 1,491 B | A | view · diff |
| git:20260608.5b9071b | 2026-06-08 | 5b9071b | 1,490 B | A | view · diff |
| git:20260216.e040818 | 2026-02-16 | e040818 | 1,492 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 (3248 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
bendrucker/claude · 18 stars · license MIT · pushed 2026-11-07 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_52dkh6e2looe2ynb GET https://markdownregistry.com/api/v1/resolve?ref=bendrucker/claude/git:conflicts GET https://markdownregistry.com/api/v1/blob/cbd236d7a3a157e916bd7edb9401d26b304fe9429e615d32838a93f729d1c607
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.