← All skills

resolving-merge-conflicts

85 / 100 · Low risk

Fine to try.

By nodetool-ai/nodetool (GitHub) · media · 631 stars · scanned at commit 61e4dfe

Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result.

Works with any agent that supports SKILL.md skills.

What this skill can do

Install

Paste this into your terminal. It downloads exactly the version we scanned, not whatever is newest.

if [ -e ~/.agents/skills/'resolving-merge-conflicts' ] || [ -L ~/.agents/skills/'resolving-merge-conflicts' ]; then echo 'A skill folder named resolving-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/nodetool-ai/nodetool' "$d" && git -C "$d" checkout --quiet '61e4dfe56d57dda1ea79345d7595912bd4ce358b' -- '.agents/skills/resolving-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'.agents/skills/resolving-merge-conflicts' ~/.agents/skills/'resolving-merge-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/'resolving-merge-conflicts' ~/.claude/skills/'resolving-merge-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

The badge for nodetool-ai/nodetool shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/nodetool-ai/nodetool.svg)](https://zalavijaysinh.github.io/skilltrust/repos/nodetool-ai/nodetool/)

Score history