Skill1.9k estrellas del repoactualizado 1mo ago

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

- 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

agent-coordinationSkill

Coordinate Crew (persistent) and Polecat (transient) agents using Gas Town's hook-based work distribution and GUPP principle.

agent-dispatchSkill

architecture-designSkill

architecture-patternsSkill

System and API design guidance covering component boundaries, data flow, integration patterns, and scalability considerations.

assimilate-popular-workflowsSkill

This skill should be used when the user asks to "find skills in the wild", "assimilate popular workflows", "discover SKILL.md files in repos", "research external skills", "find workflow patterns", "survey the skill landscape", "what skills exist out there", or wants to investigate public repositories for extractable processes, babysitter plugins, and reusable procedural insights. Searches GitHub for SKILL.md files, classifies repos by archetype, and maintains structured research under docs/reference-repos/.

audit-trailSkill

babysitSkill

babysit-babysitter-issuesSkill

This skill should be used when the user asks to "babysit issues", "work on assigned issues", "check a5c-agent issues", "process babysitter issues", or wants to find and work on open GitHub issues assigned to a5c-agent in the babysitter repo.