git-merge-expert — Claude Code skill: what it does, how to install
git-merge-expert handles branch and PR merges, conflict resolution and rollbacks, checking readiness and writing a backup tag before anything moves.
no license 182 installs ★ 5 updated 2026-08-31
npx skills add ulpi-io/skills --skill git-merge-expert -a claude-codeWhat git-merge-expert does
The skill walks through a merge in stages. It inspects the working tree, branch topology, CI and review state, then picks between merging in place and handing off to an isolated worktree. For anything beyond a trivial merge it writes a backup tag first. Conflicts get resolved so neither side is lost, and lockfiles are regenerated instead of edited by hand. Cleanup or rollback comes only after the result passes checks.
SKILL.md holds the workflow and points elsewhere for detail: references/merge-strategies.md covers merge method and PR readiness, references/conflict-and-rollback.md covers conflict tiers and recovery, references/merge-expertise.md covers domain background. The tool list runs Bash, Read, Edit, Write, Glob, Grep, AskUserQuestion and Skill. PR merges go through gh.
Nothing fires on its own. The skill carries disable-model-invocation: true, so you have to ask for a merge, a conflict fix or a rollback. That fits something rewriting shared history. Force-push, branch deletion and destructive rollback all stop for explicit confirmation, and git revert wins over git reset on shared branches.
What it helps with
- merge a feature branch without breaking CI
- clear lockfile conflicts by regenerating the file
- undo a bad merge with
git revert - check PR readiness before hitting merge
- delete merged branches and leave the others alone
Example prompts for the agent
/git-merge-expertmergefeature/authintomain, show me the checks first/git-merge-expertresolve the conflicts in this merge and keep both sides/git-merge-expertroll back the last merge onmain, plan first
How to install git-merge-expert
1Skills CLI (Vercel)
npx skills add ulpi-io/skills --skill git-merge-expert -a claude-code2Manually: put the files in place
~/.claude/skills/git-merge-expert/SKILL.mdCopy the whole skill folder; for one project use .claude/skills/git-merge-expert/
1Skills CLI (Vercel)
npx skills add ulpi-io/skills --skill git-merge-expert -a codex2Manually: put the files in place
.agents/skills/git-merge-expert/SKILL.mdFor all projects use ~/.agents/skills/
1Skills CLI (Vercel)
npx skills add ulpi-io/skills --skill git-merge-expert -a cursor2Manually: put the files in place
.cursor/skills/git-merge-expert/SKILL.mdCursor also reads .agents/skills/ and .claude/skills/
1GitHub CLI
gh skill install ulpi-io/skills git-merge-expert2Manually: put the files in place
.github/skills/git-merge-expert/SKILL.md1Skills CLI (Vercel)
npx skills add ulpi-io/skills --skill git-merge-expert -a gemini-cli2Platform CLI
gemini skills install https://github.com/ulpi-io/skills --path git-merge-expertManually: put the files in place
.devin/skills/git-merge-expert/SKILL.mdThe legacy .windsurf/skills/ path still works
Skills CLI (Vercel)
npx skills add ulpi-io/skills --skill git-merge-expert -a opencodeClaude.ai
Zip the folder and upload it in Settings → Capabilities → Skills
Step by step, with commands for each platform: How to install skills in Claude Code: five ways
Questions about git-merge-expert
How do I install git-merge-expert in Claude Code?
Run npx skills add ulpi-io/skills --skill git-merge-expert -a claude-code. The skill lands at ~/.claude/skills/git-merge-expert/SKILL.md.
What does git-merge-expert do?
It runs branch and PR merges, resolves conflicts and rolls back bad merges, with a readiness check and a backup tag up front and validation afterwards.
When does it hand off to git-merge-expert-worktree?
When you ask for isolation, when the merge is risky or takes several steps, or when safe cleanup and retry matter more than speed.