---
name: withastro-merge
description: "Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next."
license: "NOASSERTION"
metadata:
  decimalai-skill-id: "6d2dfa33-c4be-45a2-89f8-0be378a921eb"
  decimalai-version-id: "087080d0-39ad-4b13-8009-261c0b36c2b6"
  decimalai-version: "1"
  decimalai-body-sha256: "1552161ed2ca4ebd687f3149db6748b1d4f35fb1ce8eeb05d7fa276163d1d39b"
  decimalai-name: "withastro/merge"
  decimalai-format: "1"
  decimalai-invocation: "model"
  decimalai-category: "devops"
  decimalai-source: "https://app.decimal.ai/s/withastro-merge@1/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.