Matt PocockFor the moment you are mid-rebase with twelve conflicted files and no memory of what either side was trying to do. It reads both sides for intent rather than picking a hunk and moving on.
In the author’s words
Use when you need to resolve an in-progress git merge/rebase conflict.
The description field from SKILL.md, quoted as written.
Read it before you install it
SKILL.md · 9 lines
Install on its own
Or add it to your stack above and install everything at once.
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflictsTrust audit
View the source ↗- Checked automatically and confirmed.
- Resolved (HTTP 200), passed
- Checked automatically and confirmed.
- Resolves · 263,542 stars, passed
- Checked automatically and confirmed.
- Transcribed from the author's own page, passed
- Checked automatically and confirmed.
- Last updated 28 days ago, passed
- Checked automatically and confirmed.
- Credited to Matt Pocock, passed
Goes well with
executing-plans
Works a written plan through to the end.
The other half of writing-plans. It keeps the agent on the plan it agreed to, step by step, rather than quietly redesigning halfway down.
npx skills add https://github.com/obra/superpowers --skill executing-plans
using-git-worktrees
Gives the work an isolated workspace before it starts.
Sets up a worktree so a feature or a plan runs somewhere other than your current checkout. Cheap insurance when an agent is about to touch a lot of files.
npx skills add https://github.com/obra/superpowers --skill using-git-worktrees
DeliveryFull page & trust audit →subagent-driven-development
Runs the independent parts of a plan in parallel.
For a plan whose tasks do not depend on each other. It hands them to separate agents in the same session, which is faster and keeps each one's context focused on its own piece.
npx skills add https://github.com/obra/superpowers --skill subagent-driven-development
DeliveryFull page & trust audit →
Jesse Vincent