Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ dc33d649#1004

Merged
NoiseFan merged 18 commits into
devfrom
sync-dc33d649-1
Jul 10, 2026
Merged

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ dc33d649#1004
NoiseFan merged 18 commits into
devfrom
sync-dc33d649-1

Conversation

@docschina-bot

Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

AriPerkkio and others added 16 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>
Co-authored-by: mdong1909 <mdong1909@users.noreply.github.com>
@docschina-bot
docschina-bot requested a review from elonehoo July 3, 2026 23:58
@netlify

netlify Bot commented Jul 3, 2026

Copy link
Copy Markdown

Deploy Preview for cn-vitest ready!

Name Link
🔨 Latest commit 12faebf
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/6a50a1865d97ea00082e7a12
😎 Deploy Preview https://deploy-preview-1004--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.

@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: a6366b8251

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

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 committed merge conflict markers

This unresolved conflict block makes .vitepress/config.ts invalid TypeScript, so any VitePress dev/build command that loads the config will fail before the docs site can start. I also checked for conflict markers repo-wide with rg, and similar markers remain in multiple Markdown files, but this config block alone is enough to break the site build.

Useful? React with 👍 / 👎.

@NoiseFan
NoiseFan merged commit 60996c4 into dev Jul 10, 2026
5 checks passed
@NoiseFan
NoiseFan deleted the sync-dc33d649-1 branch July 10, 2026 07:40
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.

8 participants