Resolve an in-progress merge or rebase conflict by tracing each side back to its intent. Use when "resolve the conflicts", "fix this merge", "the rebase is stuck", or a pull has left conflict markers in the tree.
Install
npx skills add kensaurus/skills --skill workflow-merge-conflictsnpx skills add kensaurus/skills --skill workflow-merge-conflicts -a claude-code -gnpx skills add kensaurus/skills --skill workflow-merge-conflicts -a codex -ggemini skills install https://github.com/kensaurus/skills.git --path skills/workflow-merge-conflictsgh skill install kensaurus/skills workflow-merge-conflictsgit clone --depth 1 https://github.com/kensaurus/skills /tmp/kensaurus__skills
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/kensaurus__skills/skills/workflow-merge-conflicts ~/.claude/skills/workflow-merge-conflicts # Claude Code
cp -R /tmp/kensaurus__skills/skills/workflow-merge-conflicts ~/.agents/skills/workflow-merge-conflicts # Codex, Cursor, Gemini CLI, Copilot, OpenCode