rebase2main
Rebase to Main
将当前开发分支的提交以 rebase 方式同步到 main 分支,推送远端,再切回原分支。
工作流程
-
记录当前分支名称
git branch --show-current将结果保存,后续用于切回。如果当前已在 main 分支,提示用户并终止。
-
确认工作树干净
git status
More from ruan-cat/monorepo
git-commit
创建高质量的 git 提交:审查/暂存预期的变更,拆分为逻辑提交,并编写清晰的提交信息(遵循 Conventional Commits 规范,支持 Emoji)。当用户要求提交代码、编写提交信息、暂存变更或将工作拆分为多个提交时使用此技能。当用户提及【破坏性变更】关键词时,必须按照本技能的 BREAKING CHANGE 规范使用感叹号格式编写提交信息。优先针对 git 暂存区(staged)中的文件进行提交,只有当暂存区为空时才考虑整个工作树。当用户提及【分门别类】关键词时,必须按照本技能的多提交拆分规范,从文件类型、业务模块、修改类型、修改范围四个维度认真拆分多个提交。
27openspec
|
20openspec-sync-specs
Sync delta specs from a change to main specs. Use when the user wants to update main specs with changes from a delta spec, without archiving the change.
13openspec-ff-change
Fast-forward through OpenSpec artifact creation. Use when the user wants to quickly create all artifacts needed for implementation without stepping through each one individually.
13openspec-new-change
Start a new OpenSpec change using the experimental artifact workflow. Use when the user wants to create a new feature, fix, or modification with a structured step-by-step approach.
13openspec-apply-change
Implement tasks from an OpenSpec change. Use when the user wants to start implementing, continue implementation, or work through tasks.
13