docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 1a64d60c#972
Conversation
…mplementation (#10288) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: sheremet-va <16173870+sheremet-va@users.noreply.github.com>
Co-authored-by: Codex <noreply@openai.com>
…ternal on node (#10243) Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Codex <noreply@openai.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: e2268ef04a
ℹ️ 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 | ||
| `expect.element` 是 `expect.poll(() => element)`的简写,工作方式完全相同。 | ||
| ======= | ||
| Like [`expect.poll`](/api/expect#poll), `expect.element` retries DOM assertions until they pass or the timeout is reached. When it receives a locator, Vitest resolves it with [`locator.findElement()`](/api/browser/locators#findelement) before running the DOM assertion. The `timeout` option applies to the whole retry operation. The `interval` option controls how often failed DOM assertions are retried, but locator resolution uses `findElement`'s own increasing retry intervals. | ||
| >>>>>>> 1a64d60cbf1eb0a369bb876b68cb16cf72bc2434 |
There was a problem hiding this comment.
Resolve leftover merge-conflict markers in docs
This commit leaves unresolved conflict markers (<<<<<<<, =======, >>>>>>>) in published Markdown, which means readers will see raw merge artifacts and conflicting content instead of final documentation. I confirmed this pattern in multiple files touched by the commit (api/browser/assertions.md, api/browser/context.md, api/expect.md, and guide/index.md), so the merge appears incomplete and should be resolved before release.
Useful? React with 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ 1a64d60)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-1a64d60c-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。