fix conflict

Author: loveloki

Diff for: src/content/learn/build-a-react-app-from-scratch.md

@@ -65,11 +65,7 @@ Rsbuild 内置了对 React 特性的支持，如快速刷新、JSX、TypeScript
 
 #### React Native 的 Metro {/*react-native*/}
 
-<<<<<<< HEAD
 如果你从头开始使用 React Native，你将需要使用 [Metro](https://metrobundler.dev/), 这是 React Native 的 JavaScript 打包工具。Metro 支持 iOS 和 Android 等平台的打包，但与这里提到的工具相比，它缺少许多功能。除非你的项目需要 React Native 支持，否则我们建议从 Vite、Parcel 或 Rsbuild 开始。
-=======
-If you're starting from scratch with React Native you'll need to use [Metro](https://metrobundler.dev/), the JavaScript bundler for React Native. Metro supports bundling for platforms like iOS and Android, but lacks many features when compared to the tools here. We recommend starting with Vite, Parcel, or Rsbuild unless your project requires React Native support.
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
 
 </Note>
 

Diff for: src/content/learn/reusing-logic-with-custom-hooks.md

@@ -1333,11 +1333,7 @@ export function useOnlineStatus() {
 
 在上述示例中，`useOnlineStatus` 借助一组 [`useState`](/reference/react/useState) 和 [`useEffect`](/reference/react/useEffect) 实现。但这不是最好的解决方案。它有许多边界用例没有考虑到。例如，它认为当组件加载时，`isOnline` 已经为 `true`，但是如果网络已经离线的话这就是错误的。你可以使用浏览器的 [`navigator.onLine`](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/onLine) API 来检查，但是在生成初始 HTML 的服务端直接使用它是没用的。简而言之这段代码可以改进。
 
-<<<<<<< HEAD
-幸运的是，React 18 包含了一个叫做 [`useSyncExternalStore`](/reference/react/useSyncExternalStore) 的专用 API，它可以解决你所有这些问题。这里展示了如何利用这个新 API 来重写你的 `useOnlineStatus` Hook：
-=======
-React includes a dedicated API called [`useSyncExternalStore`](/reference/react/useSyncExternalStore) which takes care of all of these problems for you. Here is your `useOnlineStatus` Hook, rewritten to take advantage of this new API:
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
+React 包含了一个叫做 [`useSyncExternalStore`](/reference/react/useSyncExternalStore) 的专用 API，它可以解决你所有这些问题。这里展示了如何利用这个新 API 来重写你的 `useOnlineStatus` Hook：
 
 <Sandpack>
 

Diff for: src/content/learn/tutorial-tic-tac-toe.md

@@ -2247,11 +2247,7 @@ body {
 
 </Sandpack>
 
-<<<<<<< HEAD
 当你在传递给 `map` 的函数中遍历 `history` 数组时，`squares` 参数遍历 `history` 的每个元素，`move` 参数遍历每个数组索引：`0` 、`1`、`2`……（在大多数情况下，你需要数组元素，但要渲染落子列表，你只需要索引。）
-=======
-As you iterate through the `history` array inside the function you passed to `map`, the `squares` argument goes through each element of `history`, and the `move` argument goes through each array index: `0`, `1`, `2`, …. (In most cases, you'd need the actual array elements, but to render a list of moves you will only need indexes.)
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
 
 对于井字棋游戏历史中的每一步，你创建一个列表项 `<li>`，其中包含一个按钮 `<button>`。该按钮有一个 `onClick` 处理程序，它调用一个名为 `jumpTo` 的函数（你尚未实现）。
 

Diff for: src/content/reference/react/Component.md

@@ -1298,12 +1298,7 @@ class ErrorBoundary extends React.Component {
       // 在 div 中（由 APP 创建）
       // 在 App 中
       info.componentStack,
-<<<<<<< HEAD
-      // 仅在 react@canary 版本可用
       // 警告：Owner Stack 在生产中不可用
-=======
-      // Warning: `captureOwnerStack` is not available in production.
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
       React.captureOwnerStack(),
     );
   }

Diff for: src/content/reference/react/StrictMode.md

@@ -86,17 +86,10 @@ root.render(
 
 严格模式启用了以下仅在开发环境下有效的行为：
 
-<<<<<<< HEAD
 - 组件将 [重新渲染一次](#fixing-bugs-found-by-double-rendering-in-development) 以查找由于非纯渲染而引起的错误。
 - 组件将 [重新运行一次 Effect](#fixing-bugs-found-by-re-running-effects-in-development) 以查找由于缺少 Effect 清理而引起的错误。
 - 组件将 [额外重新运行一次 refs 回调](#fixing-bugs-found-by-re-running-ref-callbacks-in-development) 以查找由于缺少 ref 清理函数而引起的错误。
 - 组件将被 [检查是否使用了已弃用的 API](#fixing-deprecation-warnings-enabled-by-strict-mode)。
-=======
-- Your components will [re-render an extra time](#fixing-bugs-found-by-double-rendering-in-development) to find bugs caused by impure rendering.
-- Your components will [re-run Effects an extra time](#fixing-bugs-found-by-re-running-effects-in-development) to find bugs caused by missing Effect cleanup.
-- Your components will [re-run ref callbacks an extra time](#fixing-bugs-found-by-re-running-ref-callbacks-in-development) to find bugs caused by missing ref cleanup.
-- Your components will [be checked for usage of deprecated APIs.](#fixing-deprecation-warnings-enabled-by-strict-mode)
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
 
 **所有这些检查仅在开发环境中进行，不会影响生产构建。**
 

Diff for: src/content/reference/react/useSyncExternalStore.md

@@ -407,13 +407,7 @@ function getSnapshot() {
 
 ```js {2-5}
 function ChatIndicator() {
-<<<<<<< HEAD
-  const isOnline = useSyncExternalStore(subscribe, getSnapshot);
-  
   // 🚩 总是不同的函数，所以 React 每次重新渲染都会重新订阅
-=======
-  // 🚩 Always a different function, so React will resubscribe on every re-render
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
   function subscribe() {
     // ...
   }
@@ -427,18 +421,13 @@ function ChatIndicator() {
 如果重新渲染时你传一个不同的 `subscribe` 函数，React 会重新订阅你的 store。如果这造成了性能问题，因而你想避免重新订阅，就把 `subscribe` 函数移到外面：
 
 ```js {1-4}
-// ✅ Always the same function, so React won't need to resubscribe
+// ✅ 总是相同的函数，所以 React 不需要重新订阅
 function subscribe() {
   // ...
 }
 
-<<<<<<< HEAD
-// ✅ 总是相同的函数，所以 React 不需要重新订阅
-function subscribe() {
-=======
 function ChatIndicator() {
   const isOnline = useSyncExternalStore(subscribe, getSnapshot);
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
   // ...
 }
 ```
@@ -447,13 +436,7 @@ function ChatIndicator() {
 
 ```js {2-5}
 function ChatIndicator({ userId }) {
-<<<<<<< HEAD
-  const isOnline = useSyncExternalStore(subscribe, getSnapshot);
-  
   // ✅ 只要 userId 不变，都是同一个函数
-=======
-  // ✅ Same function as long as userId doesn't change
->>>>>>> 6ead1fae680c3ead42614f62ffae51a57f559f4f
   const subscribe = useCallback(() => {
     // ...
   }, [userId]);