Merge Queue

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

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