docs(en): merge docs-cn/sync-docs into docs-cn/dev @ a96e7c3f#950
docs(en): merge docs-cn/sync-docs into docs-cn/dev @ a96e7c3f#950
Conversation
Co-authored-by: Ari Perkkiö <ari.perkkio@gmail.com>
✅ Deploy Preview for cn-vitest ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 80d41589d0
ℹ️ 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".
| <a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a> | ||
| 通用的配置、转换器、解析器和插件。 | ||
| </ListItem> | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
The Vue SFC template includes unresolved conflict markers, which makes the template invalid and can break VitePress/Vue compilation when this component is parsed. This is a release-blocking merge artifact rather than intentional content, and it needs to be resolved to one side before the docs site can build reliably.
Useful? React with 👍 / 👎.
guide/features.md
Outdated
| <<<<<<< HEAD | ||
| 内置 [Tinyspy](https://github.com/tinylibs/tinyspy) 用于在 `vi` 对象上使用 `jest` 兼容的 API 进行对象模拟。 | ||
| ======= | ||
| Vitest provides `jest`-compatible APIs on `vi` object. | ||
| >>>>>>> a96e7c3fda767f2a71f142bcecff9e42fa9ee18e |
There was a problem hiding this comment.
This section still contains raw Git conflict markers and both conflicting text variants, so the published page will show merge artifacts and contradictory content instead of a single coherent sentence. Please resolve the conflict and keep only the intended final wording.
Useful? React with 👍 / 👎.
3 participants
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库（@ a96e7c3）
以下文件存在冲突，可能需要重新翻译：
请解决所有冲突后提交到此 pull request，可直接在 Github 修改、切换到 sync-a96e7c3f-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request！
使用该操作会导致上游仓库的内容丢失，并致使下一次合并产生冲突。