Semantic Merge

Integrate branches by intent, not by lines. Understand what each side was trying to achieve, synthesize where both changes are valid, escalate decisions that would change what the branch means to the user, and leave a documented trail that later agents can follow.

Core principle: Treat conflicts as intent conflicts first and line conflicts second. Conflicts that change intent always go to the user. The agent implements the user's integration decisions; it does not override them.

Choose a Mode

Load exactly the mode reference that matches the call path:

• Workflow sync author: references/workflow-sync-author.md when superintegrate dispatches an agent to bring the current branch onto a confirmed base.
• Workflow sync reviewer: references/workflow-sync-reviewer.md when superintegrate dispatches a separate reviewer before Integrate begins.
• Standalone merge: references/standalone-merge.md when this skill is invoked directly for a merge, rebase, cherry-pick, or branch sync outside the full integration workflow.

All modes walk the §Semantic Coherence Checklist below as the shared gated checklist.

Shared Steps

The following steps are shared by all modes.