ai-resolve-conflicts
Use when git reports merge conflicts during rebase, merge, cherry-pick, or revert operations.
Also installable via skills CLI
npx skills add arcasilesgroup/ai-engineering/src/ai_engineering/templates/project/.claude/skills/ai-resolve-conflicts
Source
Path:
src/ai_engineering/templates/project/.claude/skills/ai-resolve-conflicts/SKILL.md(main)