---
name: merging-branch
description: Merges a branch into current branch with conflict resolution. Use when: user wants to merge, combine branches, or integrate changes.
---

# Merge Skill

Execute `/merge` or `/merge <branch>` slash command.

See [merge.md](../../commands/merge.md) for workflow.