docs(en): merging all conflicts

Author: docschina-bot

.vitepress/config.ts

@@ -515,6 +515,10 @@ export default ({ mode }: { mode: string }) => {
                 text: 'retry',
                 link: '/config/retry',
               },
+              {
+                text: 'repeats',
+                link: '/config/repeats',
+              },
               {
                 text: 'onConsoleLog',
                 link: '/config/onconsolelog',

api/assert.md

@@ -2,6 +2,34 @@
 
 Vitest 从 [`chai`](https://www.chaijs.com/api/assert/) 重新导出了 `assert` 方法，用于验证不变量。
 
+::: warning In-Source Testing {#in-source-testing}
+When using [assertion functions](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#assertion-functions) such as `assert` from `import.meta.vitest` in [in-source tests](/guide/in-source), TypeScript reports error `TS2775` because they must be called via an explicitly annotated name. Annotate the variable with `Chai.Assert` or call it directly:
+
+::: code-group
+```ts [Annotated variable]
+if (import.meta.vitest) {
+  const { test, assert } = import.meta.vitest // [!code --]
+  const { test } = import.meta.vitest // [!code ++]
+  const assert: Chai.Assert = import.meta.vitest.assert // [!code ++]
+
+  test('assert', () => {
+    assert('foo' !== 'bar', 'foo should not be equal to bar')
+  })
+}
+```
+```ts [Direct call]
+if (import.meta.vitest) {
+  const { test, assert } = import.meta.vitest // [!code --]
+  const { test } = import.meta.vitest // [!code ++]
+
+  test('assert', () => {
+    assert('foo' !== 'bar', 'foo should not be equal to bar') // [!code --]
+    import.meta.vitest!.assert('foo' !== 'bar', 'foo should not be equal to bar') // [!code ++]
+  })
+}
+```
+:::
+
 ## assert
 
 - **类型:** `(expression: any, message?: string) => asserts expression`

config/repeats.md

@@ -0,0 +1,14 @@
+---
+title: repeats | Config
+outline: deep
+---
+
+# repeats
+
+- **Type:** `number`
+- **Default:** `0`
+- **CLI:** `--repeats=<number>`
+
+Repeat every test a specific number of times regardless of the result. A test that uses the [`repeats`](/api/test#repeats) test option takes precedence over this value.
+
+This is useful for verifying that tests are stable across multiple runs. If a test fails on any repetition, the whole test is reported as failed.

guide/browser/index.md

@@ -118,9 +118,13 @@ export default defineConfig({
 ```
 
 ::: info
+<<<<<<< HEAD
 Vitest 默认分配端口号 `63315` 以避免与开发服务器冲突，允许我们同时并行运行两者。我们可以通过 [`browser.api`](/config/browser/api) 选项来更改这个端口号。
 
 CLI 不会自动打印 Vite 服务器 URL。在观察模式下运行时，你可以按 "b" 键来打印 URL。
+=======
+Vitest assigns port `63315` to avoid conflicts with the development server, allowing you to run both in parallel. You can change that with the [`browser.api`](/config/browser/api) option.
+>>>>>>> 8430ac3c5895ab2beaa27433b4386989c69fc6ee
 :::
 
 如果之前未使用过 Vite，请确保已安装框架插件并在配置中指定。有些框架可能需要额外配置才能运行，请查看其 Vite 相关文档以确定。

guide/cli-generated.md

@@ -637,6 +637,13 @@ UI 模式和 HTML 报告器中提供的 HTML 覆盖率输出目录。
 
 触发重试操作的错误信息匹配正则表达式。仅当错误信息符合该模式时才会执行重试（默认值：所有错误都会触发重试）
 
+### repeats
+
+- **CLI:** `--repeats <number>`
+- **Config:** [repeats](/config/repeats)
+
+Repeat every test a specific number of times regardless of the result (default: `0`)
+
 ### diff.aAnnotation
 
 - **命令行终端:** `--diff.aAnnotation <annotation>`

guide/in-source.md

@@ -155,7 +155,15 @@ module.exports = {
 
 完整的示例请参考 [`examples/in-source-test`](https://github.com/vitest-dev/vitest/tree/main/examples/in-source-test)。
 
+<<<<<<< HEAD
 ## 说明 {#notes}
+=======
+::: warning
+There is a limitation when using [assertion functions](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#assertion-functions) such as `assert` in in-source tests. See [`assert`](/api/assert#in-source-testing) for details and workarounds.
+:::
+
+## Notes
+>>>>>>> 8430ac3c5895ab2beaa27433b4386989c69fc6ee
 
 此功能可用于:
 

guide/learn/setup-teardown.md

@@ -33,15 +33,29 @@ test('items starts with 3 fruits', () => {
   expect(items).toHaveLength(3)
 })
 
+test('can remove an item', () => {
+  items.pop()
+  expect(items).toHaveLength(2)
+})
+
 test('can add an item', () => {
   items.push('date')
   expect(items).toHaveLength(4)
+<<<<<<< HEAD
   // afterEach 会为下一个测试重置项目，
   // 因此此处的修改不会影响到其他测试
 })
 ```
 
 如果没有这些钩子，第二个测试的 `push` 操作会影响其后的所有测试，这是导致测试不稳定的典型原因。这些钩子确保了每个测试都拥有干净的状态。
+=======
+  // beforeEach reset the array to 3 items before this test ran,
+  // proving that mutations from the previous test do not leak.
+})
+```
+
+Without these hooks, mutations like `pop` or `push` from earlier tests would affect subsequent ones, which is a classic source of flaky tests, while the hooks guarantee clean state for every test.
+>>>>>>> 8430ac3c5895ab2beaa27433b4386989c69fc6ee
 
 ## 一次性初始化 {#one-time-setup}
 

guide/migration.md

@@ -138,7 +138,17 @@ $ cd subdir && vitest --config ../vitest.config.ts # [!code ++]
 
 Assignments to properties on `globalThis` or `window` in `jsdom` and `happy-dom` environments are now propagated to the underlying DOM implementation. Mutable properties such as `innerWidth` can affect APIs implemented by the DOM environment, for example `happy-dom`'s `matchMedia`.
 
+<<<<<<< HEAD
 ## 迁移至 Vitest 4.0 {#vitest-4}
+=======
+### Browser Orchestrator URL Requires a Session
+
+Vitest no longer serves the browser orchestrator UI from a bare `/__vitest_test__/` URL. Browser runner URLs are now session-bound and must include the `sessionId` generated by Vitest, for example `/__vitest_test__/?sessionId=...`.
+
+If you manually opened the browser preview by copying the Vite server URL or visiting `/__vitest_test__/` directly, use the URL opened or printed by Vitest instead.
+
+## Migrating to Vitest 4.0 {#vitest-4}
+>>>>>>> 8430ac3c5895ab2beaa27433b4386989c69fc6ee
 
 ::: warning 前提条件
 Vitest 4.0 要求 **Vite >= 6.0.0** 和 **Node.js >= 20.0.0**。