Repository navigation
CHANGELOG:去掉合并 #108 时重复的测试主题行和过时的失败说明 - #109
Merged
FrostFlops merged 1 commit intoOct 25, 2026
Merged
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
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.
问题
CHANGELOG.md的「开发与测试」一节(第 90–92 行)在 #108 合并后:--heads,没有--common-break和--future-chapter;另一遍正好相反。--integration的失败项与master相同(hero advance 等 6 项…)」。这是 万象核可以用于突破;未来编不再占用热更后的第三章;宁海、平海中文语音按中文录音的时长收尾 #107 之前的说法,和紧接着的「默认用例全部通过」那行矛盾。复现
在
master(584ddee)上看CHANGELOG.md第 90–93 行。根因
#107 和 #108 都改了这两行。#108 在网页上解决冲突(63e06fb)时,两边的版本都保留了下来。
修法
只改
CHANGELOG.md:--common-break、--future-chapter、--heads都列上;不改代码。
验证方式
git diff只有这一处,1 行新增,3 行删除。改后的文件与本地合并 #107、#108 时解决冲突的结果逐字节相同。