Merge main into dev to restore ancestry - #485
Merged
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
Keep the resolved AGENTS.md from dev (Cloud setup plus vitest --passWithNoTests, drop the stale vcpkg known-fail lines that #479 already unstuck). This merge commit makes origin/main an ancestor of dev so the next promotion PR is not CONFLICTING. Co-authored-by: ZUENS2020 <ZUENS2020@users.noreply.github.com>
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
PR Summary
Changed Files (top 200) |
This was referenced Aug 22, 2026
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.
变更摘要
把
origin/main（#478）用 merge commit 合进dev，让main重新成为dev的祖先。#483 被
auto-merge-devsquash 后，文件内容已在dev上，但 git 拓扑断了，dev→main仍会在AGENTS.md上 CONFLICTING。#484 已把 auto-merge 改成：标题以Merge main into开头则--merge。冲突解析：保留
dev侧 Cloud 说明、vitest --passWithNoTests，以及已修好的 vcpkg 用例不再列为已知失败。禁止 squash。
风险与回滚点
验证结果
git merge-base --is-ancestor origin/main HEAD在本分支成立--merge，并 dispatch Deploy Dev（提升到main需要成功的dev环境部署）