Skip to content

CHANGELOG:去掉合并 #108 时重复的测试主题行和过时的失败说明 - #109

Merged
FrostFlops merged 1 commit into
LunarConcerto:masterfrom
FrostFlops:fix/changelog-test-themes
Oct 25, 2026
Merged

FrostFlops merged 1 commit into
LunarConcerto:masterfrom
FrostFlops:fix/changelog-test-themes

Conversation

@FrostFlops

Copy link
Copy Markdown
Collaborator

问题

CHANGELOG.md 的「开发与测试」一节(第 90–92 行)在 #108 合并后:

复现

在 master(584ddee)上看 CHANGELOG.md 第 90–93 行。

根因

#107 和 #108 都改了这两行。#108 在网页上解决冲突(63e06fb)时,两边的版本都保留了下来。

修法

只改 CHANGELOG.md:

  • 两行测试主题合成一行,--common-break、--future-chapter、--heads 都列上;
  • 删掉过时的「6 项失败」那一行。

不改代码。

验证方式

git diff 只有这一处,1 行新增,3 行删除。改后的文件与本地合并 #107、#108 时解决冲突的结果逐字节相同。

@FrostFlops
FrostFlops merged commit 74d6dda into LunarConcerto:master Oct 25, 2026
@FrostFlops
FrostFlops deleted the fix/changelog-test-themes branch October 25, 2026 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant