merge-review

What problem does it solve?

Fleet agents produce worktrees that may overlap or conflict when merged back to main, creating risk of broken builds or lost changes. This Skill reads the merge-check queue, detects file-level overlaps and contradictory edits between branches, and provides actionable reconciliation guidance so maintainers can merge safely.

Core Features & Use Cases

• Queue-driven review: Reads .planning/telemetry/merge-check-queue.jsonl and processes either the full queue or a single specified branch.
• Conflict detection: Compares git diffs pairwise to identify overlapping files and classifies overlaps as additive, overlapping edits, or contradictory changes.
• Risk assessment & ordering: Produces per-branch risk levels, detailed conflict pairs with recommended resolutions, and a proposed merge order while avoiding automatic merges.
• Operational safety: Marks reviewed or merged entries in the queue, handles missing branches or worktrees gracefully, and escalates circular conflicts to the user.

Quick Start

Run the merge review across pending fleet worktrees by invoking /merge-review to generate a conflict report, recommendations, and an updated queue.