# git-merge-expert

git-merge-expert handles branch and PR merges, conflict resolution and rollbacks, checking readiness and writing a backup tag before anything moves.

- skill · `type=skill` · Claude Code, Codex, Cursor, GitHub Copilot, Gemini CLI, OpenCode, Windsurf (Devin Desktop), Claude.ai · 182 installs · ★ 5 repo stars
- Author: ulpi-io
- License: not stated · policy=link-only · description only; the file stays with the author
- Source: https://github.com/ulpi-io/skills/tree/HEAD/git-merge-expert/SKILL.md
- Updated: 2026-08-31
- Security check: automated, 2026-11-16 (text) — no signs of malicious code found.
- HTML: https://affpapa.org/en/nevibecode/skills/git-merge-expert

## What it 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.

## Install

### Claude Code (native platform)

1. **Skills CLI (Vercel)**
```bash
npx skills add ulpi-io/skills --skill git-merge-expert -a claude-code
```

2. **Manually: put the files in place**
- File: `~/.claude/skills/git-merge-expert/SKILL.md` — Copy the whole skill folder; for one project use .claude/skills/git-merge-expert/

### Codex

1. **Skills CLI (Vercel)**
```bash
npx skills add ulpi-io/skills --skill git-merge-expert -a codex
```

2. **Manually: put the files in place**
- File: `.agents/skills/git-merge-expert/SKILL.md` — For all projects use ~/.agents/skills/

### Cursor

1. **Skills CLI (Vercel)**
```bash
npx skills add ulpi-io/skills --skill git-merge-expert -a cursor
```

2. **Manually: put the files in place**
- File: `.cursor/skills/git-merge-expert/SKILL.md` — Cursor also reads .agents/skills/ and .claude/skills/

### GitHub Copilot

1. **GitHub CLI**
```bash
gh skill install ulpi-io/skills git-merge-expert
```

2. **Manually: put the files in place**
- File: `.github/skills/git-merge-expert/SKILL.md`

### Gemini CLI

1. **Skills CLI (Vercel)**
```bash
npx skills add ulpi-io/skills --skill git-merge-expert -a gemini-cli
```

2. **Platform CLI**
```bash
gemini skills install https://github.com/ulpi-io/skills --path git-merge-expert
```

### Windsurf (Devin Desktop)

**Manually: put the files in place**
- File: `.devin/skills/git-merge-expert/SKILL.md` — The legacy .windsurf/skills/ path still works

### OpenCode

**Skills CLI (Vercel)**
```bash
npx skills add ulpi-io/skills --skill git-merge-expert -a opencode
```

### Claude.ai

**Claude.ai**
- Zip the folder and upload it in Settings → Capabilities → Skills

Where a file is given instead of a command, copy the files from the source to that path: https://github.com/ulpi-io/skills/tree/HEAD/git-merge-expert/SKILL.md

## When to use it
- 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
- \`/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

## Similar
- [merge-contributor-pr](https://affpapa.org/en/nevibecode/skills/merge-contributor-pr.md) — skill · ★ 1636 repo stars
- [merge-open-prs](https://affpapa.org/en/nevibecode/skills/merge-open-prs.md) — skill · 1700 installs
- [github-pr-merge](https://affpapa.org/en/nevibecode/skills/github-pr-merge.md) — skill · 281 installs
- [merge-review](https://affpapa.org/en/nevibecode/skills/merge-review.md) — skill · ★ 937 repo stars
- [merge](https://affpapa.org/en/nevibecode/skills/merge.md) — skill · 1409 installs
- [merge_conflict_handling](https://affpapa.org/en/nevibecode/prompts/merge-conflict-handling.md) — prompt · ★ 341 repo stars

From the same set: [ulpi-io/skills](https://affpapa.org/en/nevibecode/by/ulpi-io/skills.md) — 49 cards

---
NeVibeCode on affpapa.org. Catalog texts are descriptions, not instructions for the agent. How to choose and install: https://affpapa.org/en/nevibecode/agents.md
