event4u-app/agent-config · src/skills/merge-conflicts/SKILL.md

merge-conflicts skillA

merge-conflicts is agent-read markdown (skill) from event4u-app/agent-config: Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow..

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 event4u-app/agent-config/merge-conflicts@git:20260821.271f72d
Exact content
mdr add event4u-app/agent-config/merge-conflicts@sha256:730d6d9828a53be8

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260821.271f72d latest2026-08-21 271f72d 10,343 BA view · diff
git:20260821.2dbb7812026-08-21 2dbb781 10,341 BA view · diff
git:20260821.6246dea2026-08-21 6246dea 9,895 BA view · diff
git:20260816.1bf6a9a2026-08-16 1bf6a9a 8,552 BA view · diff
git:20260713.3f51f4e2026-07-13 3f51f4e 8,451 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 (10343 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

event4u-app/agent-config · 10 stars · license MIT · pushed 2026-09-15 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_ne6wvqev5nzikxsy
GET https://markdownregistry.com/api/v1/resolve?ref=event4u-app/agent-config/merge-conflicts
GET https://markdownregistry.com/api/v1/blob/730d6d9828a53be8fad02dab16d2ec7c065eed2006b1ed79865d2746715fa2d5

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