Skip to content
Kitbay
Skill

merge

NOASSERTIONUpdated on Nov 11, 202663,887GitHub stars

A maintainer skill in the Astro repository for merging the main branch into the next branch, used for pre-releases. It is a dispatcher: a step argument picks one of three instruction files.

What the skill teaches

A maintainer skill in the Astro repository for merging the main branch into the next branch, used for pre-releases. It is a dispatcher: a step argument picks one of three instruction files. The conflict step resolves each conflicted file by type, keeping next's pre-release versions and API while carrying over main's bug fixes, discarding the lockfile for regeneration and staging the result. The changeset step deletes changesets whose bumps main has already released, keeping config and pre-release files and anything uncertain. The CI step fixes build, type and test errors. Each step stops without committing or installing, leaving that to the calling agent, and spawns no subagents.

Capabilities

  • Resolve merge conflicts from main into next
  • Remove changesets already released on main
  • Fix build, type and test failures after a merge