Overview
What It Does
Resolving Merge Conflicts packages a focused coding & development workflow for an AI agent. Use when you need to resolve an in-progress git merge/rebase conflict. It is best suited to users who can review the resulting actions and provide only the accounts, files, or command access needed for the task. It is not a substitute for human approval on destructive, financial, security-sensitive, or public-facing actions.
Task ideas
Popular Use Cases
- Review and improve a code change
- Automate a repeatable development task
- Investigate failures and prepare a fix
- Work with repositories and developer tooling
Installation
Install this Agent Skill
Claude Code
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflictsCommands derived from the public GitHub SKILL.md record. Checked 2026-09-02. Review the source before running them.
Before you start
Requirements
| Claude Code | Required / review |
| Codex | Required / review |
| Public SKILL.md source | Required / review |
| Review instructions and requested permissions before installation | Required / review |
| Paid service | Check source |
| Supported system | Check source |
Popularity context
Why It’s Popular
Resolving Merge Conflicts is a verified Agent Skill from mattpocock with a public SKILL.md, compatible with Claude Code, Codex.
Alternatives
