fix conflict

Author: loveloki

src/content/reference/react-dom/static/prerenderToNodeStream.md

@@ -88,11 +88,7 @@ app.use('/', async (request, response) => {
 
 ### 将 React 树渲染到静态 HTML 的流中 {/*rendering-a-react-tree-to-a-stream-of-static-html*/}
 
-<<<<<<< HEAD
 调用 `prerenderToNodeStream` 可将 React 树渲染为指向 [Node.js 流](https://nodejs.org/api/stream.html) 的静态 HTML：
-=======
-Call `prerenderToNodeStream` to render your React tree to static HTML into a [Node.js Stream](https://nodejs.org/api/stream.html):
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 ```js [[1, 5, "<App />"], [2, 6, "['/main.js']"]]
 import { prerenderToNodeStream } from 'react-dom/static';

src/content/reference/react/Component.md

@@ -1334,19 +1334,11 @@ class ErrorBoundary extends React.Component {
 
 如果 `Profile` 或其子组件抛出错误，`ErrorBoundary` 将“捕获”该错误，然后显示带有你提供的错误消息的后备 UI，并向你的错误报告服务发送生产错误报告。
 
-<<<<<<< HEAD
 你不需要将每个组件包装到单独的错误边界中。当你考虑 [错误边界的布置](https://aweary.dev/fault-tolerance-react/) 时，请考虑在哪里显示错误消息才有意义。例如，在消息传递应用程序中，在对话列表周围放置错误边界是有意义的。在每条单独的消息周围放置一个也是有意义的。然而，在每个头像周围设置边界是没有意义的。
 
 <Note>
 
 目前还没有办法将错误边界编写为函数式组件。但是你不必自己编写错误边界类。例如，你可以使用 [`react-error-boundary`](https://github.com/bvaughn/react-error-boundary) 包来代替。
-=======
-You don't need to wrap every component into a separate Error Boundary. When you think about the [granularity of Error Boundaries,](https://www.brandondail.com/posts/fault-tolerance-react) consider where it makes sense to display an error message. For example, in a messaging app, it makes sense to place an Error Boundary around the list of conversations. It also makes sense to place one around every individual message. However, it wouldn't make sense to place a boundary around every avatar.
-
-<Note>
-
-There is currently no way to write an Error Boundary as a function component. However, you don't have to write the Error Boundary class yourself. For example, you can use [`react-error-boundary`](https://github.com/bvaughn/react-error-boundary) instead.
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 </Note>
 

src/content/reference/react/Profiler.md

@@ -81,11 +81,7 @@ function onRender(id, phase, actualDuration, baseDuration, startTime, commitTime
 
 <Pitfall>
 
-<<<<<<< HEAD
-进行性能分析会增加一些额外的开销，因此 **在默认情况下，它在生产环境中是被禁用的**。如果要启用生产环境下的性能分析，你需要启用 [特殊的带有性能分析功能的生产构建](https://fb.me/react-profiling)。
-=======
-Profiling adds some additional overhead, so **it is disabled in the production build by default.** To opt into production profiling, you need to enable a [special production build with profiling enabled.](/reference/dev-tools/react-performance-tracks#using-profiling-builds)
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
+进行性能分析会增加一些额外的开销，因此 **在默认情况下，它在生产环境中是被禁用的**。如果要启用生产环境下的性能分析，你需要启用 [特殊的带有性能分析功能的生产构建](/reference/dev-tools/react-performance-tracks#using-profiling-builds)。
 
 </Pitfall>
 

src/content/reference/react/cache.md

@@ -62,19 +62,10 @@ function Chart({data}) {
 
 #### 注意 {/*caveats*/}
 
-<<<<<<< HEAD
-[//]: # 'TODO: 一旦 https://github.com/reactjs/react.dev/pull/6177 被合并，将为服务器组件/客户端组件（Server/Client Component）引用添加链接'
-
 - React 将在每次服务器请求时使所有记忆化函数的缓存失效。
 - 每次调用 `cache` 都会创建一个新函数。这意味着多次使用相同的函数调用 `cache` 将返回不共享相同缓存的不同记忆化函数。
 - `cachedFn` 还会缓存错误。如果对于某些参数 `fn` 抛出错误，错误将被缓存，当使用相同参数调用 `cachedFn` 时，相同的错误将被重新抛出。
 - `cache` 仅供在 [服务器组件](/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023#react-server-components) 中使用。
-=======
-- React will invalidate the cache for all memoized functions for each server request.
-- Each call to `cache` creates a new function. This means that calling `cache` with the same function multiple times will return different memoized functions that do not share the same cache.
-- `cachedFn` will also cache errors. If `fn` throws an error for certain arguments, it will be cached, and the same error is re-thrown when `cachedFn` is called with those same arguments.
-- `cache` is for use in [Server Components](/reference/rsc/server-components) only.
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 ---
 
@@ -212,27 +203,16 @@ async function MinimalWeatherCard({city}) {
 
 <Note>
 
-<<<<<<< HEAD
-[//]: # 'TODO: 合并后向服务器组件添加链接。'
-
 <CodeStep step={3}>异步渲染</CodeStep> 只在服务器组件中支持。
-=======
-<CodeStep step={3}>Asynchronous rendering</CodeStep> is only supported for Server Components.
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 ```js [[3, 1, "async"], [3, 2, "await"]]
 async function AnimatedWeatherCard({city}) {
 	const temperature = await getTemperature(city);
 	// ...
 }
 ```
-<<<<<<< HEAD
-[//]: # 'TODO: 合并后在文档中添加链接和提醒。'
-[//]: # '参与 `use` 相关文档以了解更多关于在客户端组件中使用异步数据渲染组件的内容。'
-=======
 
 To render components that use asynchronous data in Client Components, see [`use()` documentation](/reference/react/use).
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 </Note>
 

src/content/reference/react/useEffectEvent.md

@@ -90,11 +90,7 @@ function Page({ url }) {
 }
 ```
 
-<<<<<<< HEAD
-你可以将 `url` 这样的响应式值作为参数传递给 Effect Event。这让你可以访问最新的值，而不必因为这些值的改变而让 Effect 重新运行。
-=======
 In this example, the Effect should re-run after a render when `url` changes (to log the new page visit), but it should **not** re-run when `numberOfItems` changes. By wrapping the logging logic in an Effect Event, `numberOfItems` becomes non-reactive. It's always read from the latest value without triggering the Effect.
 
 You can pass reactive values like `url` as arguments to the Effect Event to keep them reactive while accessing the latest non-reactive values inside the event.
 
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2

src/content/versions.md

@@ -52,12 +52,8 @@ React 文档位于 [react.dev](https://react.dev)，提供最新版本 React 的
 - [React Compiler Case Studies](https://www.youtube.com/watch?v=lvhPq5chokM)
 - [React 19 Deep Dive: Coordinating HTML](https://www.youtube.com/watch?v=IBBN-s77YSI)
 
-<<<<<<< HEAD
 **发布版本**
-=======
-**Releases**
 - [v19.2.0 (October, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1920-october-1st-2025)
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 - [v19.1.0 (March, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1910-march-28-2025)
 - [v19.0.0 (December, 2024)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1900-december-5-2024)
 
@@ -302,11 +298,7 @@ React 文档位于 [react.dev](https://react.dev)，提供最新版本 React 的
 
 React 于 2013 年 5 月 29 日开源。初始提交为：[`75897c`: Initial public release](https://github.com/facebook/react/commit/75897c2dcd1dd3a6ca46284dd37e13d22b4b16b4)。
 
-<<<<<<< HEAD
 请参阅第一篇博客文章：[Why did we build React?](https://legacy.reactjs.org/blog/2013/06/05/why-react.html)
-=======
-See the first blog post: [Why did we build React?](https://legacy.reactjs.org/blog/2013/06/05/why-react.html)
->>>>>>> f9e2c1396769bb5da87db60f9ff03683d18711e2
 
 React 于 2013 年在 Facebook 西雅图办公室开源：