docs(en): merge docs-cn/sync-docs into docs-cn/dev @ dc33d649#1004
Conversation
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>
…eenshot` (#10592)
…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>
…en worker fails to start (#10293)
Co-authored-by: mdong1909 <mdong1909@users.noreply.github.com>
✅ Deploy Preview for cn-vitest ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
There was a problem hiding this comment.
💡 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".
| <<<<<<< HEAD | ||
| ['script', { 'src': 'https://cdn.usefathom.com/script.js', 'data-site': 'BEAFAKYG', 'data-spa': 'auto', 'defer': '' }], | ||
| ======= | ||
| >>>>>>> dc33d649841aab990a2bf304a8d524bdec9d6d55 |
There was a problem hiding this comment.
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 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ dc33d64)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-dc33d649-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。