# Merge

> Merges a branch into current branch with conflict resolution. Use when user wants to merge, combine branches, or integrate changes.

- Skill: `majiayu000/merge-10` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/merge-10`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/merge-10/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/majiayu000/merge-10

---


# Merge

Merge branch: $ARGUMENTS (default: origin main) into current branch.

## Task

Merge the specified branch into the current branch. Resolve conflicts if any occur.

```bash
git merge $ARGUMENTS
# or default:
git merge origin main
```

If conflicts occur, analyze and resolve them, then complete the merge.