ulises-jeremias/agent-toolkit · plugins/agent-toolkit-complete/.github/skills/fix-merge-conflicts/SKILL.md

fix-merge-conflicts skillA

fix-merge-conflicts is agent-read markdown (skill) from ulises-jeremias/agent-toolkit: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution.

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 ulises-jeremias/agent-toolkit/fix-merge-conflicts@git:20260831.856ee57
Exact content
mdr add ulises-jeremias/agent-toolkit/fix-merge-conflicts@sha256:ada35e42bf199b79

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260831.856ee57 latest2026-08-31 856ee57 4,102 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 (4102 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

ulises-jeremias/agent-toolkit · 17 stars · license MIT · pushed 2026-09-17 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_57afeehv3jkmtp3z
GET https://markdownregistry.com/api/v1/resolve?ref=ulises-jeremias/agent-toolkit/fix-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/ada35e42bf199b79015790893b93905dfccc3952a206d916ccd45b4750f21b2e

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