Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
Install
npx skills add tailcallhq/forgecode --skill resolve-conflictsnpx skills add tailcallhq/forgecode --skill resolve-conflicts -a claude-code -gnpx skills add tailcallhq/forgecode --skill resolve-conflicts -a codex -ggemini skills install https://github.com/tailcallhq/forgecode.git --path .forge/skills/resolve-conflictsgh skill install tailcallhq/forgecode resolve-conflictsgit clone --depth 1 https://github.com/tailcallhq/forgecode /tmp/tailcallhq__forgecode
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/tailcallhq__forgecode/.forge/skills/resolve-conflicts ~/.claude/skills/resolve-conflicts # Claude Code
cp -R /tmp/tailcallhq__forgecode/.forge/skills/resolve-conflicts ~/.agents/skills/resolve-conflicts # Codex, Cursor, Gemini CLI, Copilot, OpenCode