Resolve Git Merge Conflicts With AI: The 5-Step Workflow

Sun, 23 Aug 2026 00:00:00 +0000

Resolve every hunk, never run --abort, and preserve both sides’ intent — that’s the complete doctrine of Matt Pocock’s resolving-merge-conflicts skill (347.8K installs, #131 on the skills.sh all-time leaderboard). I read the SKILL.md out of the mattpocock/skills repo (233K stars) after watching a coding agent hit its first real conflict: it stared at <<<<<<< markers, picked the HEAD side, and silently deleted a feature branch’s work. The skill’s rules exist to stop exactly that. This guide walks the five steps in order, with the exact behaviors the skill demands at each one.

Git Workflow on Top AI Skills

Resolve Git Merge Conflicts With AI: The 5-Step Workflow