synaptiai/synapti-marketplace · plugins/flow/skills/merge-conflict-resolution/SKILL.md

merge-conflict-resolution skillA

merge-conflict-resolution is agent-read markdown (skill) from synaptiai/synapti-marketplace: Detect, classify (porcelain status; complexity: trivial, semantic, structural, delete-modify), and resolve git merge conflicts through per-file strategy selection (accept-ours, accept-theirs, manual-merge, rebase), manual conflict hunk parsing, and post-resolution verification (orphaned markers, build, tests). Use when a branch has conflicts with its merge target or when rebasing onto an updated base. This skill MUST be consulted because silently dropping changes is non-negotiable; every conflic.

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 synaptiai/synapti-marketplace/merge-conflict-resolution@git:20260909.6778255
Exact content
mdr add synaptiai/synapti-marketplace/merge-conflict-resolution@sha256:221c40650ea1ae8f

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

0 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260909.6778255 latest2026-09-09 6778255 4,596 BA view · diff
git:20260506.b1f0fef2026-05-06 b1f0fef 5,490 BA view · diff
git:20260312.7a9753f2026-03-12 7a9753f 5,203 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 (4596 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

synaptiai/synapti-marketplace · 6 stars · license Apache-2.0 · pushed 2026-09-11 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_6ke2vsrecqnxva4u
GET https://markdownregistry.com/api/v1/resolve?ref=synaptiai/synapti-marketplace/merge-conflict-resolution
GET https://markdownregistry.com/api/v1/blob/221c40650ea1ae8f2917b07a2338d0834e54c5fee5f8d49a05da24c824cab34e