merge-conflict-resolution SKILL.md skillA
merge-conflict-resolution from synaptiai/synapti-marketplace is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add synaptiai/synapti-marketplace/merge-conflict-resolution@git:20261101.fe898b3Pins git:20261101.fe898b3 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- synaptiai/synapti-marketplace
- Path
plugins/flow/skills/merge-conflict-resolution/SKILL.md- Versions recorded
- 4
- Latest version
- git:20261101.fe898b3, committed Nov 1, 2026
- First version recorded
- Mar 12, 2026
- Size
- 4,621 bytes
- Repository stars
- 7
- License
- Apache-2.0
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, ask-user), 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…
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# Merge Conflict Resolution ## Contract Iron law: **never silently drop changes — every resolution accounts for both sides, documents any excluded lines, and asks the user rather than guessing.** Invoked by `/flow:resolve` Phase 1 (detect and classify), Phase 2 (per-file strategy plan), Phase 3 (resolve hunks), and Phase 4 (marker audit, complete merge/rebase, quality checks). Returns, per conflicted file: type (UU/AA/UD/DU/AU/UA), complexity (trivial/semantic/structural/delete-modify), strategy (accept-ours/accept-theirs/manual-merge/ask-user), hunk count, and result, plus the quality outcome. Permitted skips: none — trivial files auto-resolve only when `conflictResolution.autoResolveTrivial` is true; delete-modify and competing hunks always go to the user. ## Detect ```bash git diff --name-only --diff-filter=U git status --porcelain ``` Settings: `conflictResolution.autoResolveTrivial` (default `true`), `conflictResolution.maxConflictFiles` (default 20). Above the limit, `AskUserQuestion`: proceed anyway, or abort and rebase in smaller steps. ## Classify | Status | Type | |--------|------| | UU | Content — both sides modified the same file | …
Read the whole file at its exact version.
How to install
mdr add synaptiai/synapti-marketplace/merge-conflict-resolution@sha256:06a1ba76397e8dfbThe line at the top of this page pins the label git:20261101.fe898b3, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_6ke2vsrecqnxva4u)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 4 versions of this file, between Mar 12, 2026 and Nov 1, 2026, about one every 78 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261101.fe898b3 latest | 2026-11-01 | fe898b3 | 4,621 B | A | view · diff |
| git:20260909.6778255 | 2026-09-09 | 6778255 | 4,596 B | A | view · diff |
| git:20260506.b1f0fef | 2026-05-06 | b1f0fef | 5,490 B | A | view · diff |
| git:20260312.7a9753f | 2026-03-12 | 7a9753f | 5,203 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (4621 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
synaptiai/synapti-marketplace · 7 stars · license Apache-2.0 · pushed 2026-11-06 · 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/06a1ba76397e8dfbbc2306de8020d36c5dfa274f4b0a0644fb67ed0c57232bcd
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.
More from synaptiai/synapti-marketplace
Every file in synaptiai/synapti-marketplace