Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 41871de9#1003

Open
docschina-bot wants to merge 15 commits into
devfrom
sync-41871de9-1
Open

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 41871de9#1003
docschina-bot wants to merge 15 commits into
devfrom
sync-41871de9-1

Conversation

@docschina-bot

Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

AriPerkkio and others added 15 commits June 23, 2026 23:20
Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vladimir Sheremet <sleuths.slews0s@icloud.com>
…est` by default (#10621)

Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
Co-authored-by: OpenCode (claude-opus-4-8) <noreply@opencode.ai>
Co-authored-by: Ari Perkkiö <ari.perkkio@gmail.com>
Co-authored-by: mdong1909 <mdong1909@users.noreply.github.com>
Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
Co-authored-by: OpenCode (claude-opus-4-8) <noreply@opencode.ai>
…#10654)

Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
Co-authored-by: OpenCode (claude-opus-4-8) <noreply@opencode.ai>
Co-authored-by: Ari Perkkiö <ari.perkkio@gmail.com>
@docschina-bot docschina-bot requested a review from elonehoo July 2, 2026 00:02
@netlify

netlify Bot commented Jul 2, 2026

Copy link
Copy Markdown

Deploy Preview for cn-vitest failed.

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

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

Copy link
Copy Markdown

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: 0253108d9b

ℹ️ 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 .vitepress/config.ts
Comment on lines +65 to +68
<<<<<<< HEAD
['script', { 'src': 'https://cdn.usefathom.com/script.js', 'data-site': 'BEAFAKYG', 'data-spa': 'auto', 'defer': '' }],
=======
>>>>>>> 41871de90bd24e87ceda9a58bc7c4133ec04a6d6

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

This conflict marker is committed into .vitepress/config.ts; because the VitePress config is parsed as TypeScript, the docs site cannot load or build while these raw <<<<<<<, =======, and >>>>>>> lines remain. I also checked the commit with git diff --check, which reports the same kind of leftover markers across several changed Markdown files, so the merge needs to be resolved before publishing.

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.

7 participants