Codex Worktree-Merge Workflow

Quick Start

Merge completed execution group worktrees back to main branch.

Core workflow: Load Status → Check Dependencies → Merge Groups → Cleanup Worktrees

Key features:

• Dependency-aware merge: Merge groups in correct order
• Conflict detection: Check for cross-group file conflicts
• Selective or bulk merge: Merge single group or all completed groups
• Cleanup option: Remove worktrees after successful merge

Overview

1. Load Status - Read worktree-status.json and execution-groups.json
2. Validate Dependencies - Check group dependencies are merged first
3. Merge Worktree - Merge group's branch to main