/merge-worktree-resolve

Workflow Diagram

Phase 3 of merging-worktrees: delegates merge conflicts to the resolving-merge-conflicts skill with interface contract context, then verifies that resolved code matches contract specifications for type signatures and function behavior before continuing.

flowchart TD
    Start([Start Phase 3]) --> GatherCtx[Gather Interface Contracts]
    GatherCtx --> GatherPurpose[Gather Worktree Purpose]
    GatherPurpose --> GatherSigs[Gather Expected Signatures]

    GatherSigs --> Delegate[Invoke resolving-merge-conflicts]

    Delegate --> Resolution[Conflict Resolution Complete]

    Resolution --> CheckTypes{Type Signatures Match?}

    CheckTypes -->|Yes| CheckBehavior{Behavior Matches Spec?}
    CheckTypes -->|No| FixTypes[Fix to Match Contract]

    FixTypes --> CheckBehavior

    CheckBehavior -->|Yes| CheckBoth{Both Sides Honor Ifaces?}
    CheckBehavior -->|No| FixBehavior[Revert to Contract Version]

    FixBehavior --> CheckBoth

    CheckBoth -->|Yes| MergeContinue[Git Merge Continue]
    CheckBoth -->|No| FixBoth[Fix Interface Violations]

    FixBoth --> CheckTypes

    MergeContinue --> Done([Phase 3 Complete])

    style Start fill:#2196F3,color:#fff
    style Done fill:#2196F3,color:#fff
    style GatherCtx fill:#2196F3,color:#fff
    style GatherPurpose fill:#2196F3,color:#fff
    style GatherSigs fill:#2196F3,color:#fff
    style Delegate fill:#4CAF50,color:#fff
    style Resolution fill:#2196F3,color:#fff
    style FixTypes fill:#2196F3,color:#fff
    style FixBehavior fill:#2196F3,color:#fff
    style FixBoth fill:#2196F3,color:#fff
    style MergeContinue fill:#2196F3,color:#fff
    style CheckTypes fill:#f44336,color:#fff
    style CheckBehavior fill:#f44336,color:#fff
    style CheckBoth fill:#f44336,color:#fff

Legend

Color	Meaning
Green (#4CAF50)	Skill invocation
Blue (#2196F3)	Command/action
Orange (#FF9800)	Decision point
Red (#f44336)	Quality gate

Command Content

# Phase 3: Conflict Resolution

## Invariant Principles

1. **Synthesize both sides, never pick one** - Conflict resolution must integrate both changesets; either/or resolution loses work
2. **Interface contracts are the arbiter** - When both sides claim different behavior, the implementation plan's interface contract is ground truth
3. **Verify contracts after every resolution** - Type signatures and function behavior must match the contract spec before continuing

<RULE>When merge conflicts occur, delegate to `resolving-merge-conflicts` skill with interface contract context.</RULE>

Invoke resolving-merge-conflicts with:
- Interface contracts (from implementation plan)
- Worktree purpose (what this worktree implemented)
- Expected interfaces (type signatures, function contracts)

**After resolution - Contract Verification:**

| Check | Action if Failed |
|-------|------------------|
| Type signatures match contract | Fix to match contract spec |
| Function behavior matches spec | Revert to contract-compliant version |
| Both sides honor interfaces | Synthesis is valid |

<reflection>
After EVERY conflict resolution:
- Type signatures match contract?
- Function behavior matches spec?
- Both sides honor interfaces?

Violation = fix before `git merge --continue`
</reflection>