resolving-merge-conflicts
Top repos#5 this week by stars gained (+6,526) · best daily #1, 54 days in a daily top 10
resolving-merge-conflicts is an agent skill published by mattpocock. It lives in the mattpocock/skills repository, which has 303,549 GitHub stars and is licensed under MIT; we last read it on 2026-09-16.
Resolves merge conflicts during a git merge or rebase.
by mattpocock · one of 39 skills in mattpocock/skills →
Install
skills is a generic installer for any repository of Claude agent skills -- it reads mattpocock/skills’s own structure rather than assuming one, the same way this page reads the skill’s own SKILL.md rather than assuming a format.
npx skills add mattpocock/skills
Maintenance
Stars
303549
State
listed
Licence
MIT
From the repository
Use when you need to resolve an in-progress git merge/rebase conflict.
Common questions about resolving-merge-conflicts
- What does resolving-merge-conflicts do?
- Resolves merge conflicts during a git merge or rebase.
- How do I install resolving-merge-conflicts?
- Run npx skills add mattpocock/skills. The skills installer reads the repository’s own structure, so it works for any repository of agent skills.
- Who publishes resolving-merge-conflicts?
- mattpocock.
- Is resolving-merge-conflicts maintained, and what licence does it use?
- Its repository has 303,549 GitHub stars and its state in our directory is listed. Its last commit we recorded was on 2026-10-22. The repository declares the MIT licence.