Skill1.3k estrellas del repoactualizado today

merge-queue

The merge-queue skill processes completed agent work by collecting pending changes, detecting conflicts between overlapping branches, auto-resolving where possible, and merging in dependency order before verifying integration through tests and builds. Use this when multiple agents finish work on related code areas and changes need coordinated integration before landing to the target branch.

Ver fuente Repositorio: babysitter

Instalar en Claude Code

Copiar

git clone --depth 1 https://github.com/a5c-ai/babysitter /tmp/merge-queue && cp -r /tmp/merge-queue/library/methodologies/gastown/skills/merge-queue ~/.claude/skills/merge-queue

Después abre una sesión nueva de Claude Code; el skill carga automáticamente.

Definición

SKILL.md

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

Del mismo repositorio

code-reviewerSubagent

Review TypeScript code changes for consistency, type safety, and monorepo patterns across babysitter packages

sdk-api-documenterSubagent

Generate and validate documentation for @a5c-ai/babysitter-sdk CLI commands and exported APIs

process-builderSkill

Scaffold new babysitter process definitions following SDK patterns, proper structure, and best practices. Guides the 3-phase workflow from research to implementation.

agent-dispatchSkill

code-review-gateSkill

Architect code review with DRY, YAGNI, abstraction, and test coverage principle enforcement

feature-intakeSkill

kanban-managementSkill

streaming-progressSkill