Merge Queue
Developmentmerge-queueMerge Queue is an Agent Skill for development published in the a5c-ai/babysitter repository on GitHub: a SKILL.md instruction file an AI agent can load to do this task.
Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.
QUICK START
How to use this skill
Bring this guide into your coding agent with a prompt tailored to the tool you use.
- Open your project in Codex.
- Copy and paste the prompt below.
- Review files and risks before approving any action.
Prompt to paste
Inspect the Agent Skill at https://github.com/a5c-ai/babysitter/blob/HEAD/library/methodologies/gastown/skills/merge-queue/SKILL.md and all supporting files. Report provenance, permissions, scripts, dependencies, and security risks. Propose an exact installation into .agents/skills/merge-queue, but wait for my approval before writing files or running scripts.
Copying this prompt does not install or run the skill. Review third-party files before use.
- 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