Skip to content
Back to skills

Merge Queue

ASecurity

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

  • 1,760 stars
  • 0 votes
  • 0 copies
  • 1 view
  • Added May 29, 2026
ai-agentsbashtesting

Security analysis

A100/100

Pro scans all 2 files and shows the line behind each finding

Scanned May 29, 2026

npx -y skills add a5c-ai/babysitter --skill merge-queue --agent claude-code

Installs into .claude/skills of the current project.

Are you the author of Merge Queue?

Add the live security badge to your README. It updates with every re-scan.

Security grade badge for Merge Queue
[![Security: A — Skills Directory](https://www.skillsdirectory.com/api/skills/a5c-ai-merge-queue/badge)](https://www.skillsdirectory.com/skills/a5c-ai-merge-queue)

More formats (shields.io, HTML) on the badges page. Keep it an A: scan every change in CI with Pro.

Download with Pro
SKILL.md
---
name: merge-queue
description: Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.
allowed-tools: Read, Write, Edit, Bash, Grep, Glob, WebFetch, WebSearch, Agent, AskUserQuestion
---

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

## 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`

Files in this skill

  • README.md566 B
  • SKILL.md1.3 KB

Attribution

Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.

Comments

Loading comments…

Newsletter

Get the weekly list of safe new skills, and the ones we pulled.