← All skills

resolve-git-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 roohe/agentic-super-skills (GitHub) · coding · 10 stars · scanned at commit f483e54

Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.

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

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/roohe/agentic-super-skills.svg)](https://zalavijaysinh.github.io/skilltrust/repos/roohe/agentic-super-skills/)

Score history