merge

Merge Main

Fetch and merge the repository's base branch into the current feature branch.

Options

The user may provide these options inline:

• --base <branch>: Override the auto-detected base branch (e.g., --base develop)

Skill dependencies

• Required: None
• Optional: commit

Workflow

1. Pre-Flight Checks

Run these commands in parallel to understand the current state:

# Check for uncommitted changes
git status

# Detect the repository's default branch
gh repo view --json defaultBranchRef -q '.defaultBranchRef.name'

# Confirm which branch we are on
git branch --show-current

If --base <branch> was specified, use that value instead of the detected default branch.

If gh is not available, fall back to detecting the default branch with:

git remote show origin | grep 'HEAD branch' | sed 's/.*: //'

If the current branch is the default branch itself, warn the user that merging the base branch into itself is a no-op and stop.

2. Handle Uncommitted Changes

If git status shows uncommitted changes (staged or unstaged):

1. Warn the user that there are uncommitted changes.
2. Ask whether to:
   • Stash: Run git stash before proceeding, then git stash pop after the merge completes.
   • Commit first: Invoke the /commit skill, then continue with the merge. commit is an optional dependency: if it is not installed, leave this choice out and tell the user why, so they can commit by hand, or install commit, before running this skill again.
   • Abort: Stop without doing anything.

3. Fetch and Merge

git fetch origin <default-branch>
git merge origin/<default-branch>

Where <default-branch> is the detected or overridden base branch name.

4. Handle Merge Result

Clean Merge

If the merge completes without conflicts:

1. Report success.
2. Show a summary of what was merged:

git log HEAD@{1}..HEAD --oneline

Already Up to Date

If git reports "Already up to date.", report that the branch is already current with the base branch and stop.