Resolve content conflicts during Git merge, rebase, cherry-pick, pull, or branch integration. Use for CONFLICT, unmerged paths, or Git's "needs merge" diagnostic for an unmerged path. Trigger on fix merge conflicts, resolve rebase conflicts, cherry-pick conflict, and similar requests. Do not use for clean Git operations or review-only questions.
安装
尚未确认此技能的独立目录。下面命令会打开仓库技能选择器，请按上游说明选择技能。
skills CLI
npx skills add paulnsorensen/easy-cheese