Back to Details

merge

Compare original and translation side by side

🇺🇸

Original

English
🇨🇳

Translation

Chinese

Merge

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.
处理从main分支到next分支的合并流程。该技能包含针对每个阶段的子技能：
  • resolve-conflicts.md — 解决Git合并冲突
  • fix-ci.md — 修复构建错误、类型错误和测试失败问题
  • clean-changesets.md — 移除过时的变更集文件
调用时，请检查
step
参数以确定要运行的子技能，然后阅读并遵循对应文件中的说明。