/merge-worktree-execute

Workflow Diagram

Phase 2 of merging-worktrees: merges worktrees sequentially in dependency order, running the full test suite after each round, escalating conflicts to the resolution phase and test failures to the systematic-debugging skill.

flowchart TD
    Start([Start Phase 2]) --> Checkout[Checkout Base Branch]
    Checkout --> Pull[Pull Latest from Origin]
    Pull --> PickRound[Pick Next Round]

    PickRound --> PickWT[Pick Worktree in Round]
    PickWT --> GetBranch[Get Worktree Branch]
    GetBranch --> Merge[Git Merge Branch]

    Merge --> MergeOK{Merge Succeeded?}

    MergeOK -->|Yes| LogSuccess[Log Merge Success]
    MergeOK -->|No| Resolve[Invoke merge-worktree-resolve]

    Resolve --> MoreWT{More Worktrees in Round?}
    LogSuccess --> MoreWT

    MoreWT -->|Yes| PickWT
    MoreWT -->|No| RunTests[Run Full Test Suite]

    RunTests --> TestsPass{Tests Pass?}

    TestsPass -->|Yes| MoreRound{More Rounds?}
    TestsPass -->|No| Debug[Invoke systematic-debugging]

    Debug --> Fix[Fix Issues and Commit]
    Fix --> ReRunTests[Re-run Tests]
    ReRunTests --> RePass{Tests Pass?}

    RePass -->|Yes| MoreRound
    RePass -->|No| Debug

    MoreRound -->|Yes| PickRound
    MoreRound -->|No| Done([Phase 2 Complete])

    style Start fill:#2196F3,color:#fff
    style Done fill:#2196F3,color:#fff
    style Checkout fill:#2196F3,color:#fff
    style Pull fill:#2196F3,color:#fff
    style PickRound fill:#2196F3,color:#fff
    style PickWT fill:#2196F3,color:#fff
    style GetBranch fill:#2196F3,color:#fff
    style Merge fill:#2196F3,color:#fff
    style LogSuccess fill:#2196F3,color:#fff
    style Resolve fill:#4CAF50,color:#fff
    style RunTests fill:#2196F3,color:#fff
    style Debug fill:#4CAF50,color:#fff
    style Fix fill:#2196F3,color:#fff
    style ReRunTests fill:#2196F3,color:#fff
    style MergeOK fill:#FF9800,color:#fff
    style MoreWT fill:#FF9800,color:#fff
    style TestsPass fill:#f44336,color:#fff
    style MoreRound fill:#FF9800,color:#fff
    style RePass 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 2: Sequential Round Merging

## Invariant Principles

1. **Dependency order is non-negotiable** - Merging out of dependency order produces phantom conflicts and broken intermediate states
2. **Test after every round** - Each round must pass the full test suite before the next round begins; never batch merges without verification
3. **Conflicts escalate to resolution phase** - Merge conflicts are not resolved inline; they invoke the dedicated conflict resolution workflow

For each round, merge worktrees in dependency order:

```bash
# Checkout and update base
cd [main-repo-path]
git checkout [base-branch]
git pull origin [base-branch]

# Merge each worktree in round
WORKTREE_BRANCH=$(cd [worktree-path] && git branch --show-current)
git merge $WORKTREE_BRANCH --no-edit
```

**If merge succeeds:** Log success, continue to next worktree.

**If conflicts:** Proceed to Phase 3 (invoke `/merge-worktree-resolve`), then continue with remaining worktrees.

**Run tests after EACH round:**
```bash
pytest  # or npm test, cargo test, etc.
```

**If tests fail:**
1. Invoke `systematic-debugging` skill
2. Fix issues, commit fixes
3. Re-run tests until passing
4. Do NOT proceed to next round until green