Merge main into dev (merge commit, do not squash) - #487
Merged
Conversation
Enhance metrics-server deployment, telemetry, and UI features
Enhance metrics-server deployment and telemetry features
Enhance metrics-server deployment and improve system diagnostics
Codex/coverage feedback migration (#225)
docs: translate markdown documentation to chinese (#228) * Update README.md * docs: translate markdown documentation to chinese
Add branding images and workflow diagram
Api enhance (#252)
Merge PromeFuzzEnhance
fix: change prod domain to tianheng.zuens2020.work
Promote dev to main for prod deploy
Co-authored-by: ZUENS2020 <ZUENS2020@users.noreply.github.com>
docs(agents): add Cursor Cloud dev environment setup instructions
Co-authored-by: ZUENS2020 <ZUENS2020@users.noreply.github.com>
PR Summary
Changed Files (top 200) |
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
2 participants
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.
变更摘要
再次用 merge commit 把
origin/main接回dev祖先链（相对dev无文件 diff）。先前 #485/#486 被
main上的auto-merge-dev.yml（无条件--squash）抢先 squash。pull_request_target跑的是 default branchmain上的 workflow，所以改dev上的 auto-merge 不会生效，直到提升到main。本 PR 将用管理员 merge commit 抢在 squash 前落地，以便随后开干净的
dev→main提升 PR。风险与回滚点
--admin --merge绕过当时可能未完成的 Test；tree 与当前dev相同，风险限于拓扑。验证结果
git merge-base --is-ancestor origin/main HEAD在本分支成立