Merge main into dev to restore git ancestry - #486
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
Restore origin/main as a git ancestor of dev. File content is unchanged from current dev; the squash of #485 dropped merge topology and left AGENTS.md conflicting on promotion. 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（#483/#485 squash 已带上内容），只补 git 拓扑。#485 虽标题符合
Merge main into*，但pull_request_target实际仍执行了--squash，main不是祖先，dev→main会在AGENTS.md冲突。必须 Create a merge commit，禁止 squash。
风险与回滚点
验证结果
git merge-base --is-ancestor origin/main HEAD在本分支成立git log -1两个 parent：dev与main(docs(agents): add Cursor Cloud dev environment setup instructions #478)