Tooluck logoTooluck
SKILL.md

merge-review

Agent skill fromSethGammon/Citadel

Reviews pending fleet worktree merges before they're accepted. Reads the merge-check queue, detects file-level conflicts between branches, proposes a safe merge order, and surfaces reconciliation plans for overlapping changes.

How to install merge-review

install merge-review
# install the Citadel pack with the skills CLI
npx skills add SethGammon/Citadel

# or add only this skill to Claude Code: copy the folder

skills/merge-review/

# into

~/.claude/skills/merge-review/ (all projects)

.claude/skills/merge-review/ (one project)

skills/merge-review/SKILL.md

MITFull file
1# /merge-review — Fleet Merge Arbitration
2
3## Orientation
4
5**Use when:** reviewing pending fleet worktree merges before accepting them into the main branch.
6**Don't use when:** reviewing general code quality (use /review); checking CI status before merging (use /pr-watch).
7
8## When to Route Here
9
10- "check merges"
11- "any conflicts"
12- "what do the fleet agents want to merge"
13- "review the pending branches"
14- "is it safe to merge fleet output"
15- "arbitrate the worktrees"
16- worktree-remove.js has queued items and the user wants to process them
17
18## Invocation Forms
19
20```
21/merge-review # Process the full queue
22/merge-review {branch} # Review a specific branch only
23```
24
25## Protocol
26
27### Step 1: Read the Queue
28
29Read `.planning/telemetry/merge-check-queue.jsonl`. Each line is a JSON object:
30```json
31{"branch": "fleet/task-abc", "worktree": "/path/to/worktree", "queuedAt": "ISO"}
32```
33
34If the file doesn't exist or is empty:
35> "No pending merge reviews. Fleet agents haven't completed any worktrees recently."
36Stop here.
37
38If invoked with a specific branch (`/merge-review {branch}`): filter to that branch only.
39
40### Step 2: For Each Branch — Gather Diff Data
41
42Run `git diff main..{branch} --name-only`, `--stat`, and `git branch --list {branch}`.
43
44If the branch no longer exists: mark `status: "merged"`, note "likely already merged. Skipped.", continue.
45
46### Step 3: Detect Overlapping Files
47…

Excerpt shown under the repository's MIT license.

More skills in Citadel

Keep exploring

Similar skill repositories

thedotmack /

claude-mem
116k

Persistent Context Across Sessions for Every Agent – Captures everything your agent does during sessions, compresses it with AI, and injects relevant context back into future sessions. Works with Claude Code, OpenClaw, Codex, Gemini, Hermes, Copilot, OpenCode + More

CCCXGHGM+135 skills

Newsletter

Join the Community

Subscribe to our newsletter for the latest news and updates