merge-queue | babysitter | ClaudePluginHub

Skill

Community

merge-queue

From babysitter

411

Description

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

Install

1

Run in your terminal

$

npx claudepluginhub a5c-ai/babysitter

Tool Access

This skill is limited to using the following tools:

ReadWriteEditBashGrepGlobWebFetchWebSearchAgentAskUserQuestion

Supporting Assets

View in Repository

README.md

Skill Content

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

Collect pending changes from all agent branches
Detect conflicts between branches and target
Resolve conflicts (auto-resolve where possible)
Merge in dependency order with attribution
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

Links

GitHub Stats

21 forks

Updated 6 days ago

Actions

Similar Skills

Activates when the user asks about AI prompts, needs prompt templates, wants to search for prompts, or mentions prompts.chat. Use for discovering, retrieving, and improving prompts.

151.0k

Search, retrieve, and install Agent Skills from the prompts.chat registry using MCP tools. Use when the user asks to find skills, browse skill catalogs, install a skill for Claude, or extend Claude's capabilities with reusable AI agent components.

151.0k

Agent Development

This skill should be used when the user asks to "create an agent", "add an agent", "write a subagent", "agent frontmatter", "when to use description", "agent examples", "agent tools", "agent colors", "autonomous agent", or needs guidance on agent structure, system prompts, triggering conditions, or agent development best practices for Claude Code plugins.

75.3k