feat: 增加上游检查与独立合并准备命令 - #2
Draft
WangEdgar wants to merge 1 commit into
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
新增 upstream:check 和 upstream:prepare。显式获取双方 main，从自己的 main 创建独立工作区，正常合并上游并停在未提交状态；冲突保留现场。直接验证：当前仓库无新提交时不创建工作区；隔离 Git 仓库保留自有文件、引入上游文件并保留原工作区未提交文件。尚未启用定时检查。涉及 Git 合并操作，等待用户功能确认后进行所需评审；不合并或发布。