[ INSTALL ]
Install this skill
Use the open skills CLI to add this package to Claude Code, Codex, Cursor, or other skill-aware agents. Bifrost does not host or serve this public skill; always install from the upstream source.
npx skills add mattpocock/skills
[ ABOUT ]
What this skill is for
Use when you need to resolve an in-progress git merge/rebase conflict. Teams typically use it when they want reusable agent instructions without rewriting prompts for every session. Review the full SKILL.md on the source repository before installing in production environments.
| Property | Details |
|---|---|
| Name | resolving-merge-conflicts |
| Source | mattpocock/skills |
| Owner | mattpocock |
| Category | Workflow |
| Installs | 438.5K |
| License | See upstream repository |
[ RELATED ]
Related skills
Find Skills
Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities. This skill should be used when the user is looking for functionality that might exist as an installable skill.
ViewSetup Matt Pocock Skills
Configure this repo for the engineering skills: set up its issue tracker, triage label vocabulary, and domain doc layout. Run once before first use of the other engineering skills.
ViewHandoff
Compact the current conversation into a handoff document for another agent to pick up.
View