Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ ea5391c0#974

Merged
NoiseFan merged 5 commits into
devfrom
sync-ea5391c0-1
May 14, 2026
Merged

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ ea5391c0#974
NoiseFan merged 5 commits into
devfrom
sync-ea5391c0-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

@docschina-bot docschina-bot requested a review from elonehoo May 13, 2026 23:51
@netlify
Copy link
Copy Markdown

netlify Bot commented May 13, 2026

Deploy Preview for cn-vitest ready!

Name Link
🔨 Latest commit 4853352
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/6a05ec09a2a4ac0008ad9f82
😎 Deploy Preview https://deploy-preview-974--cn-vitest.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

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: 9b9d74fb38

ℹ️ 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/commands.md Outdated
如果自定义命令具有相同的名称,则它们将覆盖内置命令。
:::

<<<<<<< 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 merge markers in commands doc

This file still contains Git conflict markers (<<<<<<<, =======, >>>>>>>), which means the merge was not resolved and both variants are published verbatim. In rendered docs this shows broken content structure and duplicate section intent, and in doc-processing pipelines it can also break tooling that assumes clean Markdown.

Useful? React with 👍 / 👎.

Comment thread config/attachmentsdir.md Outdated
- **类型:** `string`
- **默认值:** `'.vitest/attachments'`

<<<<<<< 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 merge markers in attachmentsDir doc

The conflict marker block indicates an incomplete merge in this config page, so users will see raw conflict syntax and conflicting language variants instead of a single authoritative description. This is a correctness issue for published documentation and should be resolved before release.

Useful? React with 👍 / 👎.

Comment thread guide/projects.md Outdated
::: danger 不支持的选项
部分配置选项不允许在项目配置中使用,主要包括:

<<<<<<< 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 merge conflict block in projects guide

An unresolved conflict block remains in the “unsupported options” section, leaving two contradictory list variants in the source. This causes end-user documentation corruption and makes it unclear which options are actually unsupported in project-level config.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan merged commit 0f69d34 into dev May 14, 2026
5 checks passed
@NoiseFan NoiseFan deleted the sync-ea5391c0-1 branch May 14, 2026 15:38
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.

4 participants