Skip to main content
skill CX Codex

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

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓
npx skills add ulpi-io/skills --skill git-merge-expert -a claude-code
Open on GitHub

What 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-expert merge feature/auth into main, show me the checks first
  • /git-merge-expert resolve the conflicts in this merge and keep both sides
  • /git-merge-expert roll back the last merge on main, plan first

How to install git-merge-expert

1Skills CLI (Vercel)

npx skills add ulpi-io/skills --skill git-merge-expert -a claude-code

2Manually: put the files in place

~/.claude/skills/git-merge-expert/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/git-merge-expert/

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.

Similar skills

All skills for Git and GitHub →

From the same set49

The whole set →
cost-estimate The cost-estimate skill prices a repository, branch diff, or commit from code and Git evidence. Use it when an estimate needs scope, assumptions, and confidence. CX Codex +1 300installs browse Controls a persistent Chromium instance and native apps via the browse CLI. Useful for testing UI workflows, verifying forms, and inspecting live pages. CX Codex +1 282installs code-simplify The code-simplify skill simplifies existing code without changing its behavior. Use it for a focused cleanup when the user explicitly asks for less complexity. CX Codex +1 186installs nextjs Guides coding agents through Next.js App Router tasks while respecting the project's installed framework release and internal architecture. CX Codex +1 182installs map-project map-project inspects a single-app repository to build a concise CLAUDE.md router alongside detailed reference guides. CX Codex +1 176installs bugfix bugfix fixes confirmed bugs through a strict loop: reproduces failures with isolated tests, pinpoints root causes, and applies minimal diffs without weakening tests. CX Codex +1 176installs plan-founder-review plan-founder-review reads a plan and its JSON sidecar, checks every path and reuse claim against the real repository, then returns APPROVE, REVISE or REJECT before any agent starts work. CX Codex +1 170installs find-bugs find-bugs audits the current branch diff for real logic defects and security flaws. It verifies each issue against caller code and outputs evidence-backed findings. CX Codex +1 169installs

Project sponsors

Companies that keep this analytics open