Merge
DevelopmentmergeMerge is an Agent Skill for development published in the withastro/astro repository on GitHub: a SKILL.md instruction file an AI agent can load to do this task.
Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next.
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/withastro/astro/blob/HEAD/.agents/skills/merge/SKILL.md and all supporting files. Report provenance, permissions, scripts, dependencies, and security risks. Propose an exact installation into .agents/skills/merge, 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.
Merge
Handle the main-to-next merge process. This skill has sub-skills for each stage:
- resolve-conflicts.md — Resolve git merge conflicts
- fix-ci.md — Fix build errors, type errors, and test failures
- clean-changesets.md — Remove stale changeset files
When invoked, check the step argument to determine which sub-skill to run, then read and follow that file's instructions.