docs(cn): dissolve the conflict

Author: NoiseFan

api/expect-typeof.md

@@ -553,6 +553,7 @@ expectTypeOf(obj).toHaveProperty('b').toBeString()
 expectTypeOf(obj).toHaveProperty('a').not.toBeString()
 ```
 
+<!-- TODO: translation -->
 ## branded
 
 - **Type:** `ExpectTypeOf<BrandedType>`

config/experimental.md

@@ -2,13 +2,14 @@
 title: experimental | Config
 outline: deep
 ---
+<!-- TODO: translation -->
 
 # experimental
 
 ## 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).
+::: tip 功能反馈
+请将关于此功能反馈提交至 [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9221)。
 :::
 
 - **Type:** `boolean`
@@ -107,8 +108,8 @@ 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).
+::: tip 功能反馈
+请将关于此功能反馈提交至 [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9222)。
 :::
 
 - **Type:**
@@ -176,8 +177,8 @@ 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).
+::: tip 功能反馈
+请将关于此功能反馈提交至 [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9224)。
 :::
 
 - **Type:** `boolean`

config/onstacktrace.md

@@ -2,7 +2,7 @@
 title: onStackTrace | Config
 outline: deep
 ---
-
+<!-- TODO: translation -->
 # onStackTrace <CRoot />
 
 - **Type**: `(error: Error, frame: ParsedStack) => boolean | void`

guide/open-telemetry.md

@@ -1,10 +1,10 @@
 # Open Telemetry Support <Experimental /> {#open-telemetry-support}
-
-::: tip FEEDBACK
-Please, leave feedback regarding this feature in a [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9222).
+<!-- TODO: translation -->
+::: tip 功能反馈
+请将关于此功能反馈提交至 [GitHub Discussion](https://github.com/vitest-dev/vitest/discussions/9222)。
 :::
 
-::: tip Example Project
+::: tip 示例项目
 [GitHub](https://github.com/vitest-dev/vitest/tree/main/examples/opentelemetry)
 :::
 

guide/ui.md

@@ -129,15 +129,11 @@ 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).
+::: tip 功能反馈
+请将关于此功能反馈提交至 [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
+模块图选项卡还会提供导入耗时分析功能，默认显示加载时间最长的10个模块（点击"显示更多"可追加10个），按总耗时排序。
 
 <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">

netlify.toml

@@ -3,7 +3,7 @@ publish = ".vitepress/dist"
 command = "npx pnpm i --ignore-scripts && pnpm run build"
 
 [build.environment]
-NODE_VERSION = "20"
+NODE_VERSION = "24"
 
 [[redirects]]
 from = "https://cn-vitest.netlify.app/*"