git-merge

[IMPORTANT] Use TaskCreate to break ALL work into small tasks BEFORE starting — including tasks for each file read. This prevents context loss from long files. For simple tasks, AI may ask user whether to skip.

Quick Summary

Goal: Merge code from one branch to another with safety checks and conflict resolution.

Workflow:

1. Validate -- Check source/target branches, verify clean working tree
2. Merge -- Execute git merge with appropriate strategy
3. Resolve -- Handle conflicts if any, verify merge result

Key Rules:

• WARNING: destructive operation -- always confirm with user first
• Verify clean working tree before merge
• Use /git-conflict-resolve if conflicts arise

Variables

TO_BRANCH: $1 (defaults to main) FROM_BRANCH: $2 (defaults to current branch)

Workflow

Step 1: Sync with remote (CRITICAL)

git fetch origin
git checkout {TO_BRANCH}
git pull origin {TO_BRANCH}

Step 2: Merge from REMOTE tracking branch

# Use origin/{FROM_BRANCH} to merge remote state, not local WIP
git merge origin/{FROM_BRANCH} --no-ff -m "merge: {FROM_BRANCH} into {TO_BRANCH}"

Why origin/{FROM_BRANCH}: Ensures merging only committed+pushed changes, not local uncommitted work.

Step 3: Resolve conflicts if any

• If conflicts exist, resolve them manually
• After resolution: git add . && git commit

Step 4: Push merged result

git push origin {TO_BRANCH}

Notes

• If gh command is not available, instruct the user to install and authorize GitHub CLI first.
• If you need more clarifications, use AskUserQuestion tool to ask the user for more details.
• Always fetch and pull latest remote state before merging to avoid stale conflicts.

IMPORTANT Task Planning Notes (MUST FOLLOW)

• Always plan and break work into many small todo tasks
• Always add a final review todo task to verify work quality and identify fixes/enhancements