aethrox/doctrine · skills/resolving-merge-conflicts/SKILL.md

resolving-merge-conflicts skillA

resolving-merge-conflicts is agent-read markdown (skill) from aethrox/doctrine: Discipline for resolving an in-progress git merge or rebase conflict, a conflict marker names two divergent intents from a shared ancestor, resolved by tracing each side back to what it was trying to accomplish, never by blindly picking one side's raw text. Use when a merge or rebase has stopped with conflict markers, when deciding whether to resolve with --ours/--theirs, or when choosing between merge and rebase for integrating a branch..

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 aethrox/doctrine/resolving-merge-conflicts@git:20260809.5c2aad2
Exact content
mdr add aethrox/doctrine/resolving-merge-conflicts@sha256:7ec57db914708716

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260809.5c2aad2 latest2026-08-09 5c2aad2 5,810 BA view · diff
git:20260809.21f29b02026-08-09 21f29b0 5,870 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 (5810 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

aethrox/doctrine · 18 stars · license MIT · pushed 2026-09-11 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_ewus5nzdfsnp5tvq
GET https://markdownregistry.com/api/v1/resolve?ref=aethrox/doctrine/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/7ec57db9147087168ea07c41fab79fccaf6fa506657196d9e05e687d62a0dba3

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