mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md

resolving-merge-conflicts skillA

resolving-merge-conflicts is agent-read markdown (skill) from mambo-wang/codewiki-plus: Use when you need to resolve an in-progress git merge/rebase conflict..

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 mambo-wang/codewiki-plus/resolving-merge-conflicts@git:20260916.5a385b8
Exact content
mdr add mambo-wang/codewiki-plus/resolving-merge-conflicts@sha256:9d8114f8ef0b31f5

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260916.5a385b8 latest2026-09-16 5a385b8 918 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 (918 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

mambo-wang/codewiki-plus · 17 stars · license MIT · pushed 2026-09-16 · branch develop

API

GET https://markdownregistry.com/api/v1/artifacts/art_6igkcfu67gppvefp
GET https://markdownregistry.com/api/v1/resolve?ref=mambo-wang/codewiki-plus/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0