# Merge

> Merge 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.

- Skill name: `merge`
- Category: [Development](https://www.openparable.com/skill/development/1)
- Source: https://github.com/withastro/astro/blob/HEAD/.agents/skills/merge/SKILL.md
- Repository: withastro/astro (61,050 GitHub stars when collected)

## SKILL.md

# Merge

Handle the main-to-next merge process. This skill has sub-skills for each stage:

- [resolve-conflicts.md](resolve-conflicts.md) — Resolve git merge conflicts
- [fix-ci.md](fix-ci.md) — Fix build errors, type errors, and test failures
- [clean-changesets.md](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.

---

Source: https://www.openparable.com/skill/development/merge (OpenParable). Cite the canonical URL above.