協助解決 Git Rebase 或 Merge 過程中的衝突，提供系統化的衝突解決流程。
安装
npx skills add MilesChou/claude-marketplace --skill resolving-conflictnpx skills add MilesChou/claude-marketplace --skill resolving-conflict -a claude-code -gnpx skills add MilesChou/claude-marketplace --skill resolving-conflict -a codex -ggemini skills install https://github.com/MilesChou/claude-marketplace.git --path plugins/git/skills/resolving-conflictgh skill install MilesChou/claude-marketplace resolving-conflictgit clone --depth 1 https://github.com/MilesChou/claude-marketplace /tmp/MilesChou__claude-marketplace
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/MilesChou__claude-marketplace/plugins/git/skills/resolving-conflict ~/.claude/skills/resolving-conflict # Claude Code
cp -R /tmp/MilesChou__claude-marketplace/plugins/git/skills/resolving-conflict ~/.agents/skills/resolving-conflict # Codex, Cursor, Gemini CLI, Copilot, OpenCode