Description
resolving-merge-conflicts is an agent skill from Matt Pocock's skills collection, listed on skills.sh. It resolves an in-progress git merge or rebase: it reads why each side changed, keeps both intents where it can, runs the project's checks, and finishes the merge without aborting. A skill is a SKILL.md file of instructions (sometimes with scripts and reference notes) that an AI agent loads only when a task calls for it, so the agent knows the steps to follow and what to avoid. It is free and open source.…
Highlights
- Understands both sides of each conflict
- Runs typecheck, tests and format
- Finishes merges and rebases
Ratings & Reviews
No ratings yet
Be the first to rate resolving-merge-conflicts.
People also visit
resolving-merge-conflicts FAQ
What does the resolving-merge-conflicts skill do?
It resolves an in-progress git merge or rebase: it reads why each side changed, keeps both intents where it can, runs the project's checks, and finishes the merge without aborting.
How do I install the resolving-merge-conflicts skill?
Run: npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts
Is it free?
Yes. It is free and open source.
What is an agent skill?
A SKILL.md file of instructions, sometimes with scripts and reference notes, that an AI agent such as Claude Code loads when a task needs it, so it handles that task the same careful way every time.
What are the best resolving-merge-conflicts alternatives?
Popular alternatives to resolving-merge-conflicts include code-review, git-guardrails-claude-code and pr. See all resolving-merge-conflicts alternatives