Repository navigation
merge: preserve PR24 contributor commits in main - #29
Merged
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.
补齐 PR #24 的真实合并历史
用户要求将贡献者 @heiqiu47 的原 PR #24 真正合入 main,而不仅保留改编后的代码和共同作者署名。
PR #28 已完成按 main 边界的功能整合、跨平台适配和聊天列表优化。本 PR 使用合并提交保留 #24 的全部原始提交与作者信息,同时保留 #28 已审核、测试通过的最终文件内容。
f65caeefeb0dd6cb9e54a582b186dba06988241c。git diff --exit-code v2.0.2 HEAD通过。git merge-base --is-ancestor f65caeefeb0dd6cb9e54a582b186dba06988241c HEAD通过。本 PR 不改变 v2.0.2 正在构建的任何发布源文件。