How do I install the Resolve Merge skill?

Run npx skillmds add thedixitjain/resolve-merge in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

What does the Resolve Merge skill do?

Resolve an active merge or rebase conflict, including safe renumbering of colliding plans and chronicles. It is listed under Coding & Dev Tools on SkillMD.

Is Resolve Merge safe to use?

This skill has not completed SkillMD's automated safety review yet. Capability flags: makes network calls. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Resolve Merge?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Resolve Merge free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Resolve Merge?

thedixitjain (@thedixitjain) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Resolve Merge by thedixitjain — Agent Skill

Name: Resolve Merge
Rating: 4.2 (5 reviews)
Author: thedixitjain

File contents

Resolve Merge Conflicts

Verify MERGE_HEAD or REBASE_HEAD; otherwise stop with No merge in progress.
Before any write, list conflicts and classify each as AUTO or JUDGMENT.
AUTO requires mechanical proof; default to JUDGMENT. AUTO cases:
- Sides byte-identical (git show :2:<f> vs :3:<f>) or differing only in whitespace/EOL → take either.
- AU → git add, but git rm if its slug already exists in theirs at another number (duplicate).
- Lock file → checkout one side, regenerate via the package manager.
- CHANGELOG.md → merge unique entries, dedupe, keep category order.
For numbered plans/chronicles, keep THEIRS numbers. Renumber colliding OURS-only files from the next free number without gaps or duplicates; fix self, research, and cross-references.
Show every conflict with file, code, action, and classification. Ask once: Approve / Modify / Abort. Abort writes nothing.
Apply approved AUTO actions; report only counts and failures.
For each JUDGMENT file, show exact OURS and THEIRS hunks plus the proposed merge. Ask Approve / Edit / Skip; Skip leaves it conflicted.
A file failure stays conflicted and goes under Skipped; continue with others.
Verify no tracked conflict markers, valid numbering and references when relevant, and known build/lint checks.
Report N resolved: X AUTO, Y JUDGMENT; Skipped: …, then hand off to /commit without committing. Stop on failed checks.

On Codex, translate gates with codex-tools.md.

Source: hashgraph-online/awesome-codex-plugins → plugins/reidemeister94/development-skills/skills/resolve-merge/SKILL.md

Frequently asked questions