← All skills

resolving-merge-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.

By gtapps/hermitd (GitHub) · coding · 84 stars · scanned at commit c2d971a

Use when you need to resolve an in-progress git merge/rebase conflict.

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/gtapps/hermitd' "$d" && git -C "$d" checkout --quiet 'c2d971ab801daa0725f1554f92e405e62f76a3e8' -- 'plugins/hermitd-dev/skills/resolving-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'plugins/hermitd-dev/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 gtapps/hermitd shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/gtapps/hermitd.svg)](https://zalavijaysinh.github.io/skilltrust/repos/gtapps/hermitd/)

Score history