Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 93d506c0#971

Closed
docschina-bot wants to merge 5 commits into
devfrom
sync-93d506c0-1
Closed

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 93d506c0#971
docschina-bot wants to merge 5 commits into
devfrom
sync-93d506c0-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

Copilot AI and others added 5 commits May 7, 2026 15:27
…mplementation (#10288)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sheremet-va <16173870+sheremet-va@users.noreply.github.com>
…ternal on node (#10243)

Co-authored-by: Codex <noreply@openai.com>
@docschina-bot docschina-bot requested a review from elonehoo May 7, 2026 23:45
@netlify
Copy link
Copy Markdown

netlify Bot commented May 7, 2026

Deploy Preview for cn-vitest failed.

Name Link
🔨 Latest commit a885f26
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/69fd23fea240cf0008f947ba

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: a885f26318

ℹ️ 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 api/browser/assertions.md
```

::: tip
<<<<<<< HEAD
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 leftover merge markers in browser assertions docs

This section still contains unresolved conflict markers (<<<<<<<, =======, >>>>>>>), so the docs will publish raw merge artifacts instead of a coherent paragraph. In this file it also sits inside a ::: tip block, making the rendered guidance unreliable and hard to read for users until one side is selected and the markers are removed.

Useful? React with 👍 / 👎.

Comment thread api/expect.md
}
```

<<<<<<< HEAD
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 Remove unresolved conflict block in expect.poll docs

The expect.poll description includes unresolved merge conflict markers, which leaves two competing versions of the text in the page and exposes internal merge syntax to readers. This is a direct content regression in the API reference and should be resolved to a single finalized description.

Useful? React with 👍 / 👎.

Comment thread guide/index.md

:::

<<<<<<< HEAD
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 Fix unresolved conflict markers in guide index tip block

The guide index contains unresolved merge markers around the requirements tip, so the page now includes raw conflict text and two contradictory requirement statements. Because this is inside a VitePress admonition block, leaving it unresolved can also disrupt the intended block structure and confuse readers about the actual minimum versions.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan closed this May 8, 2026
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.

5 participants