Agent skill
merge-queue
Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/other/other/merge-queue-a5c-ai-babysitter
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
- 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
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?