Smart Merge

Intelligent branch merge tool that goes beyond Git's text-level conflict detection. It analyzes semantic and logical compatibility between branches, auto-resolves safe conflicts conservatively, and surfaces logical conflicts for human decision-making.

All user-facing output MUST be in Chinese. The operator interacts in Chinese. Never output English text to the user except for code, file paths, branch names, and git commands.

When to Use

• User wants to merge one branch into another
• User says /smart-merge, "合并分支", "merge X into Y"
• User is dealing with merge conflicts and wants intelligent resolution

Workflow

Phase 1: Preparation

Parse the user's input to determine:

• Source branch: The branch whose changes are being merged in (defaults to current branch if merging into a target)
• Target branch: The branch receiving the changes