docs(cn): dissolve the conflict

Author: NoiseFan

.vitepress/config.ts

@@ -808,9 +808,9 @@ export default ({ mode }: { mode: string }) => {
                 docFooterText: '追踪查看器 | 浏览器模式',
               },
               {
-                text: 'Playwright Traces',
+                text: 'Playwright 追踪',
                 link: '/guide/browser/playwright-traces',
-                docFooterText: 'Playwright Traces | Browser Mode',
+                docFooterText: 'Playwright 追踪 | 浏览器模式',
               },
               {
                 text: 'ARIA 快照',
@@ -825,43 +825,15 @@ export default ({ mode }: { mode: string }) => {
           // write X in a test?" If yes, it belongs here. Mocking sub-pages
           // live nested because they're a multi-page subtopic.
           {
-<<<<<<< HEAD
-            text: '指南',
+            text: '编写测试',
             collapsed: false,
             items: [
-              {
-                text: '命令行界面',
-                link: '/guide/cli',
-              },
-              {
-                text: '测试筛选',
-                link: '/guide/filtering',
-              },
-              {
-                text: '测试标签',
-                link: '/guide/test-tags',
-              },
               {
                 text: '测试上下文',
                 link: '/guide/test-context',
               },
               {
-                text: '测试环境',
-                link: '/guide/environment',
-              },
-              {
-                text: '测试运行生命周期',
-=======
-            text: 'Authoring',
-            collapsed: false,
-            items: [
-              {
-                text: 'Test Context',
-                link: '/guide/test-context',
-              },
-              {
-                text: 'Test Run Lifecycle',
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+                text: '运行生命周期',
                 link: '/guide/lifecycle',
               },
               {
@@ -908,37 +880,8 @@ export default ({ mode }: { mode: string }) => {
                 ],
               },
               {
-<<<<<<< HEAD
-                text: '并行测试',
-                link: '/guide/parallelism',
-              },
-              {
-                text: '测试项目',
-                link: '/guide/projects',
-              },
-              {
-                text: '报告器',
-                link: '/guide/reporters',
-              },
-              {
-                text: '覆盖率',
-                link: '/guide/coverage',
-              },
-              {
-                text: '类型测试',
-                link: '/guide/testing-types',
-              },
-              {
-                text: 'UI 模式',
-                link: '/guide/ui',
-              },
-              {
-                text: '内联测试',
-                link: '/guide/in-source',
-=======
-                text: 'Test Tags',
+                text: '测试',
                 link: '/guide/test-tags',
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
               },
               {
                 text: '测试注释',
@@ -949,14 +892,11 @@ export default ({ mode }: { mode: string }) => {
                 link: '/guide/extending-matchers',
               },
               {
-<<<<<<< HEAD
-                text: 'IDE 插件',
-=======
-                text: 'Testing Types',
+                text: '类型测试',
                 link: '/guide/testing-types',
               },
               {
-                text: 'In-Source Testing',
+                text: '内联测试',
                 link: '/guide/in-source',
               },
             ],
@@ -968,40 +908,39 @@ export default ({ mode }: { mode: string }) => {
           // page is about the runtime environment of the tests themselves
           // (jsdom, node), it still belongs here — that's a workflow choice.
           {
-            text: 'Workflow',
+            text: '工作流',
             collapsed: false,
             items: [
               {
-                text: 'CLI',
+                text: '命令行界面',
                 link: '/guide/cli',
               },
               {
-                text: 'Test Filtering',
+                text: '测试筛选',
                 link: '/guide/filtering',
               },
               {
-                text: 'Test Projects',
+                text: '测试项目',
                 link: '/guide/projects',
               },
               {
-                text: 'Test Environment',
+                text: '测试环境',
                 link: '/guide/environment',
               },
               {
-                text: 'Parallelism',
+                text: '并行测试',
                 link: '/guide/parallelism',
               },
               {
-                text: 'Reporters',
+                text: '报告器',
                 link: '/guide/reporters',
               },
               {
-                text: 'Vitest UI',
+                text: 'UI 模式',
                 link: '/guide/ui',
               },
               {
-                text: 'IDE Integration',
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+                text: 'IDE 插件',
                 link: '/guide/ide',
               },
             ],
@@ -1013,11 +952,11 @@ export default ({ mode }: { mode: string }) => {
           // measures or fixes the suite (rather than authoring or running
           // it), put it here.
           {
-            text: 'Quality & Debugging',
+            text: '质量与调试',
             collapsed: false,
             items: [
               {
-                text: 'Coverage',
+                text: '覆盖率',
                 link: '/guide/coverage',
               },
               {
@@ -1029,30 +968,7 @@ export default ({ mode }: { mode: string }) => {
                 link: '/guide/common-errors',
               },
               {
-<<<<<<< HEAD
-                text: '迁移指南',
-                link: '/guide/migration',
-                collapsed: false,
-                items: [
-                  {
-                    text: '迁移到 Vitest 4',
-                    link: '/guide/migration#vitest-4',
-                  },
-                  {
-                    text: '从 Jest 迁移',
-                    link: '/guide/migration#jest',
-                  },
-                  {
-                    text: '从 Mocha + Chai + Sinon 迁移',
-                    link: '/guide/migration#mocha-chai-sinon',
-                  },
-                ],
-              },
-              {
                 text: '性能',
-=======
-                text: 'Performance',
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
                 collapsed: false,
                 items: [
                   {
@@ -1078,7 +994,7 @@ export default ({ mode }: { mode: string }) => {
           // comes from composition, or when users would search by intent
           // rather than by API name.
           {
-            text: 'Recipes',
+            text: '技巧',
             collapsed: false,
             items: [
               {
@@ -1154,36 +1070,28 @@ export default ({ mode }: { mode: string }) => {
           // Sits near the bottom because it's not daily-use and would push
           // active-use guides further from the user's first scroll.
           {
-            text: 'Migration',
+            text: '迁移',
             link: '/guide/migration',
             collapsed: false,
             items: [
               {
-<<<<<<< HEAD
-                text: '测试技巧',
-                link: '/guide/recipes',
-              },
-              {
-                text: '测试框架比较',
-=======
-                text: 'Migrating to Vitest 4.0',
+                text: '迁移至 Vitest 4.0',
                 link: '/guide/migration#vitest-4',
               },
               {
-                text: 'Migrating from Jest',
+                text: '从 Jest 迁移',
                 link: '/guide/migration#jest',
               },
               {
-                text: 'Migrating from Mocha + Chai + Sinon',
+                text: '从 Mocha + Chai + Sinon 迁移',
                 link: '/guide/migration#mocha-chai-sinon',
               },
             ],
           },
           {
             items: [
               {
-                text: 'Comparisons',
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+                text: '测试框架比较',
                 link: '/guide/comparisons',
               },
             ],

api/advanced/vitest.md

@@ -7,13 +7,8 @@ title: Vitest API
 
 Vitest 实例需要当前的测试模式。它可以是以下之一：
 
-<<<<<<< HEAD
 - `test`：运行运行时测试时
-- `benchmark`：运行基准测试时 <Badge type="warning">实验性</Badge>
-=======
-- `test` when running runtime tests
-- `benchmark` when running benchmarks <Experimental />
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+- `benchmark`：运行基准测试时 <Experimental />
 
 ::: details New in Vitest 4
 Vitest 4 新增了多个 API（它们都标记有 "4.0.0+" 徽章），并移除了已弃用的 API：
@@ -36,11 +31,7 @@ Vitest 4 新增了多个 API（它们都标记有 "4.0.0+" 徽章），并移除
 
 测试模式只会调用 `test` 或 `it` 中的函数，并在遇到 `bench` 时抛出错误。此模式使用配置中的 `include` 和 `exclude` 选项来查找测试文件。
 
-<<<<<<< HEAD
-### benchmark <Badge type="warning">实验性</Badge> {#benchmark-experimental}
-=======
 ### benchmark <Experimental /> {#benchmark}
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
 
 基准测试模式调用 `bench` 函数，并在遇到 `test` 或 `it` 时抛出错误。此模式使用配置中的 `benchmark.include` 和 `benchmark.exclude` 选项来查找基准测试文件。
 
@@ -56,11 +47,7 @@ Vitest 4 新增了多个 API（它们都标记有 "4.0.0+" 徽章），并移除
 
 这是全局的 [`ViteDevServer`](https://vite.dev/guide/api-javascript#vitedevserver)。
 
-<<<<<<< HEAD
-## state <Badge type="warning">实验性</Badge> {#state-experimental}
-=======
 ## state <Experimental /> {#state}
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
 
 ::: warning
 公共 `state` 是一个实验性 API（除了 `vitest.state.getReportedEntity`）。破坏性更改可能不遵循 SemVer，请在使用时固定 Vitest 的版本。

api/browser/assertions.md

@@ -1003,11 +1003,7 @@ await expect.element(queryByTestId('prev')).not.toHaveSelection()
 await expect.element(queryByTestId('next')).toHaveSelection('ne')
 ```
 
-<<<<<<< HEAD
-## toMatchScreenshot <Badge type="warning">实验性</Badge> {#tomatchscreenshot}
-=======
 ## toMatchScreenshot <Experimental /> {#tomatchscreenshot}
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
 
 ```ts
 function toMatchScreenshot(

api/vi.md

@@ -1068,7 +1068,7 @@ function useFakeTimers(config?: FakeTimersConfig): Vitest
 `vi.useFakeTimers()` 不再自动模拟 `process.nextTick` 。
 仍然可以通过在 `toFake` 参数中指定选项来模拟： `vi.useFakeTimers({ toFake: ['nextTick', 'queueMicrotask'] })` 。
 :::
-
+<!-- TODO: translation -->
 You can use `toFake` to specify which timers to mock, or `toNotFake` to specify which timers to keep native. Note that `toFake` and `toNotFake` cannot be specified together.
 
 ```ts

config/browser/webdriverio.md

@@ -60,13 +60,9 @@ export default defineConfig({
 ::: tip
 最有用的选项位于 `capabilities` 对象上。WebdriverIO 允许嵌套功能，但 Vitest 将忽略这些选项，因为我们依赖于不同的机制来生成多个浏览器。
 
-<<<<<<< HEAD
 请注意，Vitest 将忽略 `capabilities.browserName` — 请改用 [`test.browser.instances.browser`](/config/browser/instances#browser)。
-=======
-Note that Vitest will ignore `capabilities.browserName`; use [`test.browser.instances.browser`](/config/browser/instances#browser) instead.
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
 :::
-
+<!-- TODO: translation -->
 ## Headful Chrome in CI
 
 Vitest enables [`browser.headless`](/config/browser/headless) automatically in CI.

config/faketimers.md

@@ -5,11 +5,7 @@ outline: deep
 
 # fakeTimers
 
-<<<<<<< HEAD
-- **类型:** `FakeTimerInstallOpts`
-=======
-- **Type:** `FakeTimerConfig`
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+- **类型:** `FakeTimerConfig`
 
 当使用 [`vi.useFakeTimers()`](/api/vi#vi-usefaketimers) 时，Vitest 会将此选项传递给 [`@sinon/fake-timers`](https://npmx.dev/package/@sinonjs/fake-timers)。
 
@@ -25,16 +21,10 @@ outline: deep
 - **类型:** `('setTimeout' | 'clearTimeout' | 'setImmediate' | 'clearImmediate' | 'setInterval' | 'clearInterval' | 'Date' | 'nextTick' | 'hrtime' | 'requestAnimationFrame' | 'cancelAnimationFrame' | 'requestIdleCallback' | 'cancelIdleCallback' | 'performance' | 'queueMicrotask')[]`
 - **默认值:** 全局可用的所有方法，除了 `nextTick` 和 `queueMicrotask`
 
-<<<<<<< HEAD
-需要模拟的全局方法和 API 名称数组。
-
-如果仅需模拟 `setTimeout()` 和 `nextTick()`，可将此属性指定为 `['setTimeout', 'nextTick']`。
-=======
-An array with names of global methods and APIs to fake. For example, to only mock `setTimeout()` and `nextTick()`, specify this property as `['setTimeout', 'nextTick']`.
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+需要模拟的全局方法和 API 名称数组。例如仅需模拟 `setTimeout()` 和 `nextTick()`，可将此属性指定为 `['setTimeout', 'nextTick']`。
 
 当使用 `--pool=forks` 在 `node:child_process` 中运行 Vitest 时，不支持模拟 `nextTick`。NodeJS 会在 `node:child_process` 内部使用 `process.nextTick`，模拟后会导致进程挂起。使用 `--pool=threads` 运行 Vitest 时支持模拟 `nextTick`。
-
+<!-- TODO: translation -->
 ## fakeTimers.toNotFake
 
 - **Type:** `('setTimeout' | 'clearTimeout' | 'setImmediate' | 'clearImmediate' | 'setInterval' | 'clearInterval' | 'Date' | 'nextTick' | 'hrtime' | 'requestAnimationFrame' | 'cancelAnimationFrame' | 'requestIdleCallback' | 'cancelIdleCallback' | 'performance' | 'queueMicrotask')[]`

guide/browser/aria-snapshots.md

@@ -3,11 +3,7 @@ title: ARIA 快照 | 指南
 outline: deep
 ---
 
-<<<<<<< HEAD
-# ARIA 快照 <Experimental/> <Version>4.1.4</Version> {#aria-snapshots}
-=======
-# ARIA Snapshots <Experimental /> <Version>4.1.4</Version> {#aria-snapshots}
->>>>>>> 3a513123224c0041b8cda52ce1f47c912ce05789
+# ARIA 快照 <Experimental /> <Version>4.1.4</Version> {#aria-snapshots}
 
 ARIA 快照可以让你测试页面的无障碍结构。你不是去断言原始 HTML 或视觉输出，而是去断言无障碍树，也就是屏幕阅读器和其他辅助技术所使用的那套结构。