Merge Queue

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

a5c-ai Updated 1.7k repo stars

File contents

  • 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)

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

a5c-ai/babysitter/tree/main/library/methodologies/gastown/skills/merge-queue commit fe01feaa13

Frequently asked questions

npx skillmds@latest add a5c-ai/merge-queue