romiluz13/cc10x · plugins/cc10x/skills/resolving-merge-conflicts/SKILL.md

resolving-merge-conflicts skillA

resolving-merge-conflicts is agent-read markdown (skill) from romiluz13/cc10x: Use when a git merge or rebase reports conflicts and the operation is in progress..

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 romiluz13/cc10x/resolving-merge-conflicts@git:20260719.252ad11
Exact content
mdr add romiluz13/cc10x/resolving-merge-conflicts@sha256:bbf4a536404805a7

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_jruuui3lhuxx4zp4.svg)](https://markdownregistry.com/a/art_jruuui3lhuxx4zp4)

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260719.252ad11 latest2026-07-19 252ad11 2,843 BA view · diff
git:20260715.07d6c192026-07-15 07d6c19 3,368 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 (2843 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

romiluz13/cc10x · 164 stars · license MIT · pushed 2026-09-11 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_jruuui3lhuxx4zp4
GET https://markdownregistry.com/api/v1/resolve?ref=romiluz13/cc10x/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/bbf4a536404805a7d8bce8bfc4cd5459c57479659fef99d05cc4c2d51e7fdbc5

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