docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 8bd62ec3 - #1009
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Co-authored-by: Raul Macarie <raul@macarie.me>
✅ 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: 8359171e64
ℹ️ 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".
| "vue": "^3.5.40" | ||
| }, | ||
| "devDependencies": { | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
Resolve the committed merge conflict markers
This conflict marker is committed inside package.json, so the file is no longer valid JSON; any workflow that reads package metadata (for example pnpm install, pnpm lint, or the VitePress build) will fail before reaching the docs. The same merge conflict should be resolved rather than leaving <<<<<<</=======/>>>>>>> content in the tree.
Useful? React with 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ 8bd62ec)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-8bd62ec3-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。