Git Merge & Conflict Resolution

Handle complex git operations: merges, cherry-picks, rebases, and conflict resolution.

Parse the user's input to determine the action:

• $git-merge or $git-merge resolve — detect and resolve current conflicts
• $git-merge branch <name> — merge a branch into current, handle conflicts
• $git-merge cherry-pick <commit>... — cherry-pick with conflict handling
• $git-merge rebase <base> — non-interactive rebase onto base
• $git-merge abort — abort in-progress merge/rebase/cherry-pick
• $git-merge status — show current merge/rebase/cherry-pick state

Prerequisites

1. Verify we're in a git repository (git rev-parse --is-inside-work-tree)
2. If not in a git repo, tell the user and stop

Action: status