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:20260312.09ebb12Pins git:20260312.09ebb12 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/gh-workflow/skills/merge-conflict-resolution/SKILL.md- Versions recorded
- 2
- Latest version
- git:20260312.09ebb12, committed Mar 12, 2026
- First version recorded
- Mar 12, 2026
- Size
- 7,126 bytes
- Repository stars
- 7
- License
- Apache-2.0
Detect, classify, and resolve git merge conflicts through structured analysis of conflict markers, per-file strategy selection, and post-resolution verification. Use when a branch has conflicts with its merge target, when rebasing onto an updated base, or when gh-merge detects an unmergeable PR.
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 Domain skill for detecting, classifying, and resolving git merge conflicts systematically. ## Iron Law **NEVER silently drop changes.** Every conflict resolution must account for both sides. If lines from either side are excluded, the rationale must be documented. When in doubt, ask the user rather than guess. ## Conflict Detection Detect conflicted files and their conflict types: ```bash # List files with unmerged entries git diff --name-only --diff-filter=U # Full status with conflict markers git status --porcelain ``` Classify each file by its porcelain status prefix. ## Conflict Type Classification | Status | Type | Description | |--------|------|-------------| | UU | Content | Both sides modified the same file | | AA | Add-add | Both sides added a file with the same name | | UD | Delete-modify (ours deleted) | We deleted, they modified | | DU | Delete-modify (theirs deleted) | They deleted, we modified | | AU | Rename-related (add/unmerged) | Rename collision | | UA | Rename-related (unmerged/add) | Rename collision | ## Conflict Complexity Classification Assess each conflicted file's complexity before choosing a strategy: …
Read the whole file at its exact version.
How to install
mdr add synaptiai/synapti-marketplace/merge-conflict-resolution@sha256:e8fe15c13421d162The line at the top of this page pins the label git:20260312.09ebb12, 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_cb2bekgrb7nxxywo)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 2 versions of this file, all committed on Mar 12, 2026.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260312.09ebb12 latest | 2026-03-12 | 09ebb12 | 7,126 B | A | view · diff |
| git:20260312.84d647a | 2026-03-12 | 84d647a | 7,188 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 (7126 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_cb2bekgrb7nxxywo GET https://markdownregistry.com/api/v1/resolve?ref=synaptiai/synapti-marketplace/merge-conflict-resolution GET https://markdownregistry.com/api/v1/blob/e8fe15c13421d162e61e01b68def913f4ad86e8e4eb8423d7914fa3f7103c883
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