13:56
2026-07-07
aihero.dev
developer-tools
The /resolving-merge-conflicts Skill
Matt Pocock's /resolving-merge-conflicts skill, available via npx skills@latest add mattpocock/skills, resolves git merge or rebase conflicts hunk by hunk by tracing each side to its primary source (cā¦