# Git Merge

> Merge branches and resolve merge conflicts.

- Skill: `andersonlimahw/git-merge` (Agent Skill)
- Install (CLI): `npx skillmds@latest add andersonlimahw/git-merge`
- Raw SKILL.md: https://api.skillmd.com/api/skills/andersonlimahw/git-merge/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: Andersonlimahw (https://skillmd.com/u/andersonlimahw)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/andersonlimahw/git-merge

---


# Git Merge Skill

Merge one branch into another with conflict resolution and strategy selection.

## Capabilities
- Merge branches (`git merge <branch>`)
- Choose strategy: `--ff` (fast-forward), `--no-ff` (no fast-forward), `--squash`, `--ff-only`
- Abort merge on conflict: `git merge --abort`
- Resolve conflicts with `git mergetool` or manual editing
- Continue merge after resolving: `git merge --continue`
- View merge log: `git log --merge`
- Create merge commits with custom messages (`-m`)

## Usage
Triggered when user says "merge branch", "merge X into Y", "resolve conflicts", "squash merge".
Use `run_command` with `git merge` and appropriate flags.