# Merge

> Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next.

- Skill: `withastro/merge` (Agent Skill, multi-file: 5 files)
- Install (CLI): `npx get-skill add withastro/merge`
- Raw SKILL.md: https://api.skillmd.com/api/skills/withastro/merge/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: withastro (https://skillmd.com/u/withastro)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/withastro/merge

---


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

