← All skills

handle-merge-conflicts

95 / 100 · Low risk

Fine to try.

By unstoppableweb/unstoppable-code (GitHub) · productivity · 35 stars · scanned at commit 6a2571e

{% if claude %}/builtin-gh:handle-merge-conflicts{% else %}$builtin-gh:handle-merge-conflicts{% endif %} only. Resolve merge conflicts with the base branch

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/'handle-merge-conflicts' ] || [ -L ~/.agents/skills/'handle-merge-conflicts' ]; then echo 'A skill folder named handle-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/unstoppableweb/unstoppable-code' "$d" && git -C "$d" checkout --quiet '6a2571e9707016c09c3976e954c89eb3c5213055' -- 'clients/desktop/brand-templates/plugins/builtin-gh/skills/handle-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'clients/desktop/brand-templates/plugins/builtin-gh/skills/handle-merge-conflicts' ~/.agents/skills/'handle-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/'handle-merge-conflicts' ~/.claude/skills/'handle-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 unstoppableweb/unstoppable-code shows the score of its lowest-scoring skill.

[![SkillTrust](https://zalavijaysinh.github.io/skilltrust/badges/unstoppableweb/unstoppable-code.svg)](https://zalavijaysinh.github.io/skilltrust/repos/unstoppableweb/unstoppable-code/)

Score history