Babysitter merge-queue

Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.

install

source · Clone the upstream repo

git clone https://github.com/a5c-ai/babysitter

Claude Code · Install into ~/.claude/skills/

T=$(mktemp -d) && git clone --depth=1 https://github.com/a5c-ai/babysitter "$T" && mkdir -p ~/.claude/skills && cp -r "$T/library/methodologies/gastown/skills/merge-queue" ~/.claude/skills/a5c-ai-babysitter-merge-queue && rm -rf "$T"

manifest: library/methodologies/gastown/skills/merge-queue/SKILL.md

Merge Queue (Refinery)

Overview

The Refinery is Gas Town's per-rig merge queue processor. It collects completed work from agents, detects conflicts between branches, resolves them (auto where possible), merges in dependency order, and verifies the integration.

When to Use

After convoy beads are complete and ready to merge
When multiple agents have worked on overlapping areas
When integration testing is needed before landing
When conflict resolution requires coordination

Process

Collect pending changes from all agent branches
Detect conflicts between branches and target
Resolve conflicts (auto-resolve where possible)
Merge in dependency order with attribution
Verify integration (tests, lint, build)

Conflict Strategies

auto: Attempt automatic resolution, escalate on failure
manual: Always require human review
theirs: Prefer incoming changes
ours: Prefer target branch changes

Tool Use

Invoke via babysitter process:

methodologies/gastown/gastown-merge-queue