Skip to content

merge: sync upstream claude-code-best/claude-code main (1a4e970)#28

Merged
y574444354 merged 4 commits intomainfrom
sync/upstream-main-20250415
Apr 16, 2026
Merged

merge: sync upstream claude-code-best/claude-code main (1a4e970)#28
y574444354 merged 4 commits intomainfrom
sync/upstream-main-20250415

Conversation

@y574444354
Copy link
Copy Markdown
Owner

Summary

同步上游 claude-code-best/claude-code main 分支的最新 4 个提交:

Conflict Resolution

文件 冲突内容 解决方式
README.md 上游新增特性表格 vs fork 的 --- 分隔线 保留上游特性表格(有价值的新内容),同时保留 --- 分隔线
package.json name/version 差异 + typecheck 脚本 保留 fork 的 @costrict/csc 品牌名和版本号,接纳上游新增的 typecheck 脚本

Test plan

  • bun install 正常安装
  • bun run typecheck 通过
  • bun test 通过
  • bun run build 构建成功

@y574444354 y574444354 force-pushed the sync/upstream-main-20250415 branch from e97c6ee to e00d348 Compare April 16, 2026 02:58
@y574444354 y574444354 force-pushed the sync/upstream-main-20250415 branch from e00d348 to da60b49 Compare April 16, 2026 03:07
@y574444354 y574444354 merged commit 4790336 into main Apr 16, 2026
1 check failed
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.

2 participants