Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 82339b69#953

Merged
NoiseFan merged 4 commits intodevfrom
sync-82339b69-1
Apr 6, 2026
Merged

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 82339b69#953
NoiseFan merged 4 commits intodevfrom
sync-82339b69-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

hi-ogawa and others added 3 commits April 4, 2026 09:37
@docschina-bot docschina-bot requested a review from elonehoo April 4, 2026 23:23
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 4, 2026

Deploy Preview for cn-vitest ready!

Name Link
🔨 Latest commit 3b772ec
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/69d303086f7bde00086138c4
😎 Deploy Preview https://deploy-preview-953--cn-vitest.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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: 3ef20ffa0f

ℹ️ 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/snapshot.md Outdated
Comment on lines +196 to +200
<<<<<<< HEAD
我们使用的是 Jest 的 `pretty-format` 来序列化快照。你可以在这里阅读更多相关内容:[pretty-format](https://github.com/facebook/jest/blob/main/packages/pretty-format/README.md#serialize).
<!-- TODO: translation -->
=======
>>>>>>> 82339b691b6342181215b95fca2b21dcc4f577e0
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 conflict block

This commit leaves raw Git conflict markers (<<<<<<<, =======, >>>>>>>) in the rendered docs, which breaks the page content and indicates the merge was not resolved. Readers will see invalid text, and the same issue appears again later in this file, so the conflict should be fully resolved by keeping a single final version of each section.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan merged commit 541bfb5 into dev Apr 6, 2026
5 checks passed
@NoiseFan NoiseFan deleted the sync-82339b69-1 branch April 6, 2026 00:55
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