← All skills

resolving-merge-conflicts

100 / 100 · Low risk

Fine to try.

By svyatov/supermatt (GitHub) · coding · 25 stars · scanned at commit 58dabac

Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted hunk, running the project's checks, and finishing the merge or rebase. Use when a merge, rebase, or pull stops on conflicts, or the user asks to resolve conflicts in an active merge or rebase. Not for standalone conflict-marker cleanup.

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

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

Score history