← All skills

git-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.

By phatblat/dotfiles (GitHub) · coding · 13 stars · scanned at commit b2d15ba

Resolve git conflicts and finish the interrupted git operation. Detects whether a rebase, merge, cherry-pick, revert, am, or stash pop stopped on conflicts, resolves and stages every unmerged path, then continues that same operation until it completes. Use as soon as git output shows "CONFLICT", "Unmerged paths", "both modified", "could not apply", "fix conflicts and then run", "rebase in progress", or "You have unmerged paths", or a config or source file fails to parse on a `<<<<<<<` marker; a…

Works with any agent that supports SKILL.md skills.

What this skill can do

Other copies in this repository

phatblat/dotfiles has 2 more folders with a skill named git-resolve-conflicts. This page shows the lowest-scoring copy.

• .agents/skills/git-resolve-conflicts 97/100 · Low risk
• .claude/skills/git-resolve-conflicts 100/100 · Low risk

Install

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

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

The badge for phatblat/dotfiles shows the score of its lowest-scoring skill.

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

Score history