merge Skill

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

Install

npx skills add 'https://github.com/withastro/astro/tree/main/.agents/skills/merge'

Download bundle ↓

SKILL.mdBrowse 5 files

143 tokens

616 bytes
Token encoding: o200k_base
Snapshot 63ca342

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.

Discovery context

Discovered by repository scan. No exact path reference found in the snapshot’s root AGENTS.md.

← All Astro skills Project instructions →