← All skills

resolve-merge-conflicts

100 / 100 · Low risk

Fine to try.

By OutlineDriven/odin-claude-plugin (GitHub) · coding · 40 stars · scanned at commit 8ce0e87

Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation.

Works with any agent that supports SKILL.md skills.

What this skill can do

We found nothing in the files we read that matches our rules. That does not prove the skill is safe: see the limits of static scanning.

Install

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

if [ -e ~/.agents/skills/'resolve-merge-conflicts' ] || [ -L ~/.agents/skills/'resolve-merge-conflicts' ]; then echo 'A skill folder named resolve-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/OutlineDriven/odin-claude-plugin' "$d" && git -C "$d" checkout --quiet '8ce0e87a3e88043cdeb4be21eec5565bbdc638ea' -- 'plugins/odin-git/skills/resolve-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'plugins/odin-git/skills/resolve-merge-conflicts' ~/.agents/skills/'resolve-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/'resolve-merge-conflicts' ~/.claude/skills/'resolve-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 OutlineDriven/odin-claude-plugin shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/OutlineDriven/odin-claude-plugin.svg)](https://zalavijaysinh.github.io/skilltrust/repos/OutlineDriven/odin-claude-plugin/)

Score history