/git

Merge code from one branch to another with conflict resolution.

Syntax

/git:merge [to-branch] [from-branch]

Arguments

Argument	Default	Description
`to-branch`	`main`	Target branch to merge into
`from-branch`	Current branch	Source branch to merge from

How It Works

Uses git-manager agent to:

Checkout target branch
Merge source branch
Resolve conflicts if any
Complete merge

Examples

# Merge current branch to main
/git:merge main

# Merge feature to develop
/git:merge develop feature/auth

# Merge hotfix to main and develop
/git:merge main hotfix/security
/git:merge develop hotfix/security

Conflict Resolution

If conflicts occur:

Agent identifies conflicting files
Analyzes changes from both branches
Resolves conflicts intelligently
Completes merge

Prerequisites

gh CLI must be installed and authorized
Git repository initialized
Both branches must exist

Key Takeaway: Use /git:merge to merge branches with automatic conflict resolution via git-manager agent.