resolve-conflicts
95 / 100 · Low risk
Fine to try. Some of what it can do is expected: a coding skill usually runs build and test commands.
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.
What this skill can do
Runs commands on your computer
Install
Paste this into your terminal. It downloads exactly the version we scanned, not whatever is newest.
if [ -e ~/.agents/skills/'resolve-conflicts' ] || [ -L ~/.agents/skills/'resolve-conflicts' ]; then echo 'A skill folder named resolve-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/tailcallhq/forgecode' "$d" && git -C "$d" checkout --quiet 'a22b49288856d5b3f3ca57e8532683d54a662c8c' -- '.forge/skills/resolve-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'.forge/skills/resolve-conflicts' ~/.agents/skills/'resolve-conflicts' && rm -rf "$d"; fi
Codex reads ~/.agents/skills directly. For Claude Code, Cursor, Copilot, Gemini CLI, Antigravity or OpenCode, also link it. For Claude Code: ln -s ~/.agents/skills/'resolve-conflicts' ~/.claude/skills/'resolve-conflicts' (other agents: ~/.cursor/skills, ~/.copilot/skills, ~/.gemini/skills, ~/.gemini/config/skills, ~/.config/opencode/skills). Or install through the finder skill, which does both.
Badge for your README
[](https://zalavijaysinh.github.io/skilltrust/repos/tailcallhq/forgecode/)
Score history
| Date | Version | Score |
|---|---|---|
| 2026-11-08 | a22b492 | 95 |
| 2026-11-07 | a22b492 | 95 |
Also found in
- justrach/codegraff2/.forge/skills/resolve-conflicts