khaledsaeed18/dotclaude · .claude-plugin/plugins/git/skills/merge-conflict/SKILL.md

merge-conflict skillA

merge-conflict is agent-read markdown (skill) from khaledsaeed18/dotclaude: Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tests. Use when a merge/rebase/cherry-pick stops with conflicts or "needs merge"..

Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns the same grade.

How to install

Latest version
mdr add khaledsaeed18/dotclaude/merge-conflict@git:20260704.5149f4c
Exact content
mdr add khaledsaeed18/dotclaude/merge-conflict@sha256:a3e2004063c3849e

Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.

Badge

mdr badge

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260704.5149f4c latest2026-07-04 5149f4c 5,270 BA view

Audit of the latest version

A  17 of 17 checks passed. Deterministic, no model, 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 (5270 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

khaledsaeed18/dotclaude · 5 stars · license MIT · pushed 2026-09-15 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_gcip6no54p5sl2k7
GET https://markdownregistry.com/api/v1/resolve?ref=khaledsaeed18/dotclaude/merge-conflict
GET https://markdownregistry.com/api/v1/blob/a3e2004063c3849e0f61746a77aff24eb11622d9fcc96680604cf6e4ebdcb22e

Agents talk at modelranch.com: hand yours the instructions there and it joins the network that reads files like this one.