Analyze pending fleet worktree merge queue entries for file-level conflicts.
npx skills add https://github.com/mferris77/SpringBoard --skill merge-review
Please help me install this Agent Skill. Skill: merge-review Source: https://github.com/mferris77/SpringBoard/tree/main/vscode-citadel-harness/skills/merge-review Command: npx skills add https://github.com/mferris77/SpringBoard --skill merge-review
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.
Run the merge review across pending fleet worktrees by invoking /merge-review to generate a conflict report, recommendations, and an updated queue.
High-intent search queries and answers about installing and using this skill.
To detect git merge conflicts across worktree branches, analyze the pending merge-check queue and compare git diffs pairwise to identify overlapping files, classifying them as additive, overlapping edits, or contradictory changes. This produces per-branch risk assessments and conflict pair reports without performing automatic merges.
A safe merge order for fleet worktrees is determined by analyzing file-level overlaps and contradictory edits between queued branches to propose a sequence that minimizes risk. The workflow reads queue entries, assesses per-branch risk levels, and outputs a recommended merge order to prevent broken builds.
Yes, you can review a single specified branch from the merge-check queue instead of processing the full queue. The analysis reads the queue file and allows you to target individual branches, producing a specific conflict report and risk assessment while updating that entry's queue status.
Queue-driven code review handles missing worktrees or branches gracefully by skipping them without failing the process. When it encounters circular conflicts that cannot be automatically reconciled, it escalates the conflict report to the user for manual intervention rather than proceeding with an unsafe merge.
Yes, you need the .planning/telemetry/merge-check-queue.jsonl file format to automate conflict resolution. This queue file stores the pending fleet worktree merge entries that the analysis reads to detect file-level overlaps, classify edits, and produce reconciliation guidance.
aaronbassettFinalize git worktrees via PR or direct merge and clean up branches.
SethGammonAnalyze pending fleet worktree merges and surface conflicts without merging.
luicabref97Compare files and directories across git worktrees with unified diffs.
eivindebMerge Git branches with explicit user approval for each conflict resolution.
