merge
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
About
- Publisher
- Astro
- Tool
- GitHub
Install
The project doesn't document install steps that we could confirm. See the project's own instructions
What's inside
- clean-changesets.md
- evals/evals.json
- fix-ci.md
- resolve-conflicts.md
MCP servers and skills can run code on your computer and act on your data. Review the source before installing.
Details
| Fact | Value | Source |
|---|---|---|
| Type | Skill | |
| Tool | GitHub | |
| Publisher | Astro | source |
| Official status | Community (not published by the tool's vendor) | source |
| Needs an API key or sign-in | Not stated in its documentation | |
| Includes scripts | No | source |
| Platforms | Not stated in its documentation | |
| AI clients | Not stated in its documentation | |
| Licence | NOASSERTION | source |
| Pricing | Not stated in its documentation | |
| Activity | Last commit Nov 11, 202663,887 GitHub starsDownload data not available (not on npm or PyPI) | source |
| Links | Repository Website |
Sources
- Skill file (SKILL.md)github.com/withastro/astro · Backs: Official status, Includes scripts, LicenceNov 10, 2026
- GitHub repositorygithub.com/withastro/astro · Backs: Publisher, ActivityNov 11, 2026
- Folder in the repository (merge)github.com/withastro/astro · Backs: Includes scriptsNov 10, 2026