docs(en): merging all conflicts

Author: docschina-bot

api/vi.md

@@ -842,7 +842,13 @@ Vitest 提供的一组有用的辅助函数。
 
 等待回调成功执行。如果回调抛出错误或返回拒绝的承诺，它将继续等待，直到成功或超时。
 
+<<<<<<< HEAD
 这在需要等待某些异步操作完成时非常有用，例如，在启动服务器并需要等待其启动时。
+=======
+If options is set to a number, the effect is equivalent to setting `{ timeout: options }`.
+
+This is very useful when you need to wait for some asynchronous action to complete, for example, when you start a server and need to wait for it to start.
+>>>>>>> 7c25641f61110b9696fbd7b05aebb925327fdd67
 
 ```ts
 import { expect, test, vi } from 'vitest'

config/index.md

@@ -2068,9 +2068,15 @@ Vitest 通常使用缓存对测试进行排序，因此长时间运行的测试
 
 #### sequence.hooks
 
+<<<<<<< HEAD
 - **类型**: `'stack' | 'list' | 'parallel'`
 - **默认值**: `'parallel'`
 - **命令行终端**: `--sequence.hooks=<value>`
+=======
+- **Type**: `'stack' | 'list' | 'parallel'`
+- **Default**: `'stack'`
+- **CLI**: `--sequence.hooks=<value>`
+>>>>>>> 7c25641f61110b9696fbd7b05aebb925327fdd67
 
 更改钩子的执行顺序。
 

guide/browser/interactivity-api.md

@@ -4,7 +4,11 @@ title: Interactivity API | Browser Mode
 
 # Interactivity API
 
+<<<<<<< HEAD
 Vitest 使用 [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/) 或 [webdriver](https://www.w3.org/TR/webdriver/) API 实现了 [`@testing-library/user-event`](https://testing-library.com/docs/user-event)应用程序接口的子集，而不是伪造事件，这使得浏览器行为更加可靠和一致。
+=======
+Vitest implements a subset of [`@testing-library/user-event`](https://testing-library.com/docs/user-event/intro) APIs using [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/) or [webdriver](https://www.w3.org/TR/webdriver/) instead of faking events which makes the browser behaviour more reliable and consistent with how users interact with a page.
+>>>>>>> 7c25641f61110b9696fbd7b05aebb925327fdd67
 
 ```ts
 import { userEvent } from '@vitest/browser/context'