docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 2faf0d30#994
docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 2faf0d30#994docschina-bot wants to merge 3 commits into
Conversation
❌ Deploy Preview for cn-vitest failed.
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 95a7b78ef1
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| <<<<<<< HEAD | ||
| ## 说明 {#notes} | ||
| ======= |
There was a problem hiding this comment.
Resolve the leftover merge conflict markers
This leaves an unresolved merge conflict in the published guide/in-source.md page (<<<<<<< HEAD, =======, and the matching >>>>>>> at line 166). In the generated docs this section will show raw conflict text and both competing headings/content instead of the intended Chinese Notes section plus warning, so the merge needs to be resolved before shipping.
Useful? React with 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ 2faf0d3)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-2faf0d30-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。