merge

Contributors

GitHub-linked commit authors for this SKILL.md at the saved revision. Co-authors and history before file renames are not included.

File history ↗

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

.agents/skills/merge/SKILL.md

Download bundle ↓
main · 63ca3425 bundle filesScanned 2026-09-14

SKILL.md

143 tokens · o200k_base · 616 bytes

Source excerpt starting at line 1.
---name: mergedescription: Handle main-to-next merge tasks including conflict resolution, changeset cleanup, and CI fix-ups. Use when merging main into next.--- # 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. 
Discovery context

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