docs(en): merging all conflicts

Author: docschina-bot

api/expect-typeof.md

@@ -552,3 +552,23 @@ expectTypeOf(obj).toHaveProperty('a').toBeNumber()
 expectTypeOf(obj).toHaveProperty('b').toBeString()
 expectTypeOf(obj).toHaveProperty('a').not.toBeString()
 ```
+
+## branded
+
+- **Type:** `ExpectTypeOf<BrandedType>`
+
+You can use `.branded` to allow type assertions to succeed for types that are semantically equivalent but differ in representation.
+
+```ts
+import { expectTypeOf } from 'vitest'
+
+// Without .branded, this fails even though the types are effectively the same
+expectTypeOf<{ a: { b: 1 } & { c: 1 } }>().toEqualTypeOf<{ a: { b: 1; c: 1 } }>()
+
+// With .branded, the assertion succeeds
+expectTypeOf<{ a: { b: 1 } & { c: 1 } }>().branded.toEqualTypeOf<{ a: { b: 1; c: 1 } }>()
+```
+
+::: warning
+This helper comes at a performance cost and can cause the TypeScript compiler to 'give up' if used with excessively deep types. Use it sparingly and only when necessary.
+:::

config/experimental.md

@@ -7,6 +7,10 @@ outline: deep
 
 ## experimental.fsModuleCache <Version type="experimental">4.0.11</Version> {#experimental-fsmodulecache}
 
+::: tip FEEDBACK
+Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9221).
+:::
+
 - **Type:** `boolean`
 - **Default:** `false`
 
@@ -103,6 +107,10 @@ At the moment, Vitest ignores the [test.cache.dir](/config/cache) or [cacheDir](
 
 ## experimental.openTelemetry <Version type="experimental">4.0.11</Version> {#experimental-opentelemetry}
 
+::: tip FEEDBACK
+Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9222).
+:::
+
 - **Type:**
 
 ```ts
@@ -168,6 +176,10 @@ It's important that Node can process `sdkPath` content because it is not transfo
 
 ## experimental.printImportBreakdown <Version type="experimental">4.0.15</Version> {#experimental-printimportbreakdown}
 
+::: tip FEEDBACK
+Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9224).
+:::
+
 - **Type:** `boolean`
 - **Default:** `false`
 

config/onstacktrace.md

@@ -7,7 +7,7 @@ outline: deep
 
 - **Type**: `(error: Error, frame: ParsedStack) => boolean | void`
 
-Apply a filtering function to each frame of each stack trace when handling errors. This does not apply to stack traces printed by [`printConsoleTrace`](#printConsoleTrace). The first argument, `error`, is a `TestError`.
+Apply a filtering function to each frame of each stack trace when handling errors. This does not apply to stack traces printed by [`printConsoleTrace`](/config/printconsoletrace#printconsoletrace). The first argument, `error`, is a `TestError`.
 
 Can be useful for filtering out stack trace frames from third-party libraries.
 

guide/open-telemetry.md

@@ -1,9 +1,11 @@
 # Open Telemetry Support <Experimental /> {#open-telemetry-support}
 
-::: tip Example Project
+::: tip FEEDBACK
+Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9222).
+:::
 
+::: tip Example Project
 [GitHub](https://github.com/vitest-dev/vitest/tree/main/examples/opentelemetry)
-
 :::
 
 [OpenTelemetry](https://opentelemetry.io/) traces can be a useful tool to debug the performance and behavior of your application inside tests.

guide/ui.md

@@ -129,7 +129,15 @@ npx vite preview --outDir ./html
 
 ### 导入耗时分析 {#import-breakdown}
 
+<<<<<<< HEAD
 模块图选项卡还会提供导入耗时分析功能，默认显示加载时间最长的10个模块（点击"显示更多"可追加10个），按总耗时排序。
+=======
+::: tip FEEDBACK
+Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9224).
+:::
+
+The Module Graph tab also provides an Import Breakdown with a list of modules that take the longest time to load (top 10 by default, but you can press "Show more" to load 10 more), sorted by Total Time.
+>>>>>>> 7e382ef570c2a5c18427069cc851ce758b47aef7
 
 <img alt="Import breakdown with a list of top 10 modules that take the longest time to load" img-light src="/ui/light-import-breakdown.png">
 <img alt="Import breakdown with a list of top 10 modules that take the longest time to load" img-dark src="/ui/dark-import-breakdown.png">