Matt Pocock may drop his merge-conflicts skill: 'That's a harness concern, not a skill concern'
mattpocockuk · x · 2026-09-15
- Matt Pocock says he'll likely remove the /resolving-merge-conflicts skill from his open-source skills collection in the next version, arguing conflict resolution belongs in the agent harness, not in a skill.
- The skill's design is still instructive: it treats conflicts as intent clashes rather than text diffs, tracing each side back to its source (commit, PR, issue), picking the side matching the merge goal when incompatible, inventing no behavior, and always finishing the merge rather than aborting.
- He's openly soliciting objections. Install via npx skills@latest add mattpocock/skills --skill=resolving-merge-conflicts.
More from coding & agent
- Make Claude your harshest critic: adversarial review and one-shot example workflows — thisdudelikesAI · 2026-09-15
- 10 Claude workflows the author claims can 10x your output — thisdudelikesAI · 2026-09-15
- Agent design tips: keep decision traces and always give users control — goyalshaliniuk · 2026-09-15
- Best coding agent scores just 38.8% on a new test, failing 6 of 10 tries — JFPuget · 2026-09-15
- Dev open-sources an agentic "Photoshop": doodle and point instead of screenshots and prompts — Pleasant-Taste1417 · 2026-09-15
- AI agent takes over an unmanaged Shopify store, delivering a working handover — NumbersProtocol · 2026-09-15