Overview

Gas Town’s Refinery is the per-rig merge queue processor. It collects completed agent work, detects conflicts between branches, resolves them (auto where possible), merges in dependency order, and verifies integration to ensure safe landings.

How This Skill Works

The process collects pending changes from all agent branches, detects conflicts between branches and the target, resolves conflicts (auto where possible), then merges in dependency order with attribution and runs verification steps (tests, lint, build).

When to Use It

• 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
• When you need verified, dependency-ordered merges before deployment

Quick Start

1. Step 1: Collect pending changes from all agent branches.
2. Step 2: Detect conflicts and auto-resolve where possible; decide strategy.
3. Step 3: Merge in dependency order with attribution and run verification (tests, lint, build).

Best Practices

• Define and apply conflict strategies (auto, manual, theirs, ours) per scenario.
• Prefer auto-resolution for simple conflicts, escalate failures promptly.
• Merge in dependency order and preserve attribution to contributors.
• Run integration verification (tests, lint, build) after merges.
• Document conflicts and resolutions to guide future merges.

Example Use Cases

• Two agents modify the same API surface; the queue auto-resolves non-breaking conflicts while flagging API-signature changes for review.
• Merges follow a dependency chain where feature B depends on changes in feature A.
• Simple formatting or whitespace conflicts are auto-resolved.
• API signature changes require manual review before landing.
• Post-merge verification detects a failing test suite and triggers a rerun or rollback.

Frequently Asked Questions