Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 2faf0d30#994

Open
docschina-bot wants to merge 3 commits into
devfrom
sync-2faf0d30-1
Open

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 2faf0d30#994
docschina-bot wants to merge 3 commits into
devfrom
sync-2faf0d30-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

合并 vitest-dev/docs-cn 的修改至本仓库(@ 2faf0d3

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-2faf0d30-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

@docschina-bot docschina-bot requested a review from elonehoo June 8, 2026 00:00
@netlify
Copy link
Copy Markdown

netlify Bot commented Jun 8, 2026

Deploy Preview for cn-vitest failed.

Name Link
🔨 Latest commit 95a7b78
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/6a26063bb3389600074cbcf3

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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".

Comment thread guide/in-source.md
Comment on lines +158 to +160
<<<<<<< HEAD
## 说明 {#notes}
=======
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge 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 👍 / 👎.

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.

3 participants