Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ c18a924d - #1008

Closed
docschina-bot wants to merge 2 commits into
devfrom
sync-c18a924d-1
Closed

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ c18a924d#1008
docschina-bot wants to merge 2 commits into
devfrom
sync-c18a924d-1

Conversation

@docschina-bot

Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

renovate Bot and others added 2 commits August 3, 2026 14:14
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vladimir Sheremet <sleuths.slews0s@icloud.com>
@docschina-bot
docschina-bot requested a review from elonehoo August 4, 2026 00:01
@netlify

netlify Bot commented Aug 4, 2026

Copy link
Copy Markdown

Deploy Preview for cn-vitest failed.

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

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

ℹ️ 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 package.json
"vue": "^3.5.40"
},
"devDependencies": {
<<<<<<< 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 markers from package.json

The merge conflict markers make package.json invalid JSON, so any workflow that parses it (for example pnpm install, scripts, or the docs build) will fail before dependencies can be resolved. I verified this with JSON.parse, which errors at this marker, so the conflict needs to be resolved rather than committed.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan closed this Aug 7, 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.

2 participants