merge-queue

SkillAI & models

Lets your agent manage a code merge queue by collecting changes, resolving conflicts, and merging them in order.

Available today. Use it from your connected AI after setup.

Connect ahel once, and every AI you use reads what you have installed.

Then ask your AI: use the merge-queue skill

About this capability

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

What this skill tells your AI

The instructions your AI receives, as published by a5c-ai/babysitter in library/methodologies/gastown/skills/merge-queue/SKILL.md and read by ahel’s review.

  • 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

Signals

GitHub stars
2k
Forks
106
Last commit
Sep 2026
Advanced
Catalog kind
skill
Gateway key
merge-queue
Source
github.com/a5c-ai/babysitter