fix conflict

Author: mrbadri

src/content/learn/add-react-to-an-existing-project.md

@@ -24,11 +24,7 @@ title: اضافه کردن ری‌اکت به یک پروژه موجود
 2. **`/some-app` را به‌عنوان *مسیر پایه*** در پیکربندی فریم‌ورک خود مشخص کنید (راهنما: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath)، [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
 3. **سرور یا پروکسی خود را پیکربندی کنید** تا همه درخواست‌های زیر مسیر `/some-app/` توسط اپلیکیشن ری‌اکت شما مدیریت شوند.
 
-<<<<<<< HEAD
-این کار تضمین می‌کند که بخش ری‌اکت اپلیکیشن شما می‌تواند از [بهترین شیوه‌های موجود](/learn/build-a-react-app-from-scratch#consider-using-a-framework) که در این فریم‌ورک‌ها تعبیه شده‌اند بهره‌مند شود.  
-=======
-This ensures the React part of your app can [benefit from the best practices](/learn/build-a-react-app-from-scratch#consider-using-a-framework) baked into those frameworks.
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
+این کار تضمین می‌کند که بخش ری‌اکت اپلیکیشن شما می‌تواند از [بهترین شیوه‌های موجود](/learn/build-a-react-app-from-scratch#consider-using-a-framework) که در این فریم‌ورک‌ها تعبیه شده‌اند بهره‌مند شود. 
 
 بسیاری از فریم‌ورک‌های مبتنی بر ری‌اکت فول‌استک هستند و به اپلیکیشن ری‌اکت شما اجازه می‌دهند از قابلیت‌های سرور استفاده کند. با این حال، حتی اگر نتوانید یا نخواهید جاوااسکریپت را روی سرور اجرا کنید، می‌توانید از همان رویکرد استفاده کنید. در این حالت، خروجی HTML/CSS/JS را (خروجی [`next export`](https://nextjs.org/docs/advanced-features/static-html-export) در Next.js یا حالت پیش‌فرض در Gatsby) در مسیر `/some-app/` سرو کنید.  
 

src/content/learn/react-compiler/installation.md

@@ -176,20 +176,7 @@ Install the ESLint plugin:
 npm install -D eslint-plugin-react-hooks@rc
 </TerminalBlock>
 
-<<<<<<< HEAD
-Then enable the compiler rule in your ESLint configuration:
-
-```js {3}
-// .eslintrc.js
-module.exports = {
-  rules: {
-    'react-hooks/react-compiler': 'error',
-  },
-};
-```
-=======
 If you haven't already configured eslint-plugin-react-hooks, follow the [installation instructions in the readme](https://github.com/facebook/react/blob/main/packages/eslint-plugin-react-hooks/README.md#installation). The compiler rule is enabled by default in the latest RC, so no additional configuration is needed.
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 The ESLint rule will:
 - Identify violations of the [Rules of React](/reference/rules)

src/content/learn/react-compiler/introduction.md

@@ -154,11 +154,7 @@ Next.js users can enable the swc-invoked React Compiler by using [v15.3.1](https
 
 ## What should I do about useMemo, useCallback, and React.memo? {/*what-should-i-do-about-usememo-usecallback-and-reactmemo*/}
 
-<<<<<<< HEAD
-If you are using React Compiler, [`useMemo`](/reference/react/useMemo), [`useCallback`](/reference/react/useCallback), and [`React.memo`](/reference/react/memo) can be removed. React Compiler adds automatic memoization more precisely and granularly than is possible with these hooks. If you choose to keep manual memoization, React Compiler will analyze them and determine if your manual memoization matches its automatically inferred memoization. If there isn't a match, the compiler will choose to bail out of optimizing that component.
-=======
 React Compiler adds automatic memoization more precisely and granularly than is possible with [`useMemo`](/reference/react/useMemo), [`useCallback`](/reference/react/useCallback), and [`React.memo`](/reference/react/memo). If you choose to keep manual memoization, React Compiler will analyze them and determine if your manual memoization matches its automatically inferred memoization. If there isn't a match, the compiler will choose to bail out of optimizing that component.
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 This is done out of caution as a common anti-pattern with manual memoization is using it for correctness.  This means your app depends on specific values being memoized to work properly. For example, in order to prevent an infinite loop, you may have memoized some values to stop a `useEffect` call from firing. This breaks the Rules of React, but since it can potentially be dangerous for the compiler to automatically remove manual memoization, the compiler will just bail out instead. You should manually remove your handwritten memoization and verify that your app still works as expected.
 

src/content/reference/react/Activity.md

@@ -51,11 +51,7 @@ While hidden, children still re-render in response to new props, albeit at a low
 
 When the boundary becomes <CodeStep step={3}>visible</CodeStep> again, React will reveal the children with their previous state restored, and re-create their Effects.
 
-<<<<<<< HEAD
-In this way, Activity can thought of as a mechanism for rendering "background activity". Rather than completely discarding content that's likely to become visible again, you can use Activity to maintain and restore that content's UI and internal state, while ensuring hidden content has no unwanted side effects.
-=======
 In this way, Activity can be thought of as a mechanism for rendering "background activity". Rather than completely discarding content that's likely to become visible again, you can use Activity to maintain and restore that content's UI and internal state, while ensuring that your hidden content has no unwanted side effects.
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 [See more examples below.](#usage)
 
@@ -66,23 +62,15 @@ In this way, Activity can be thought of as a mechanism for rendering "background
 
 #### Caveats {/*caveats*/}
 
-<<<<<<< HEAD
-- When used with `<ViewTransition>`, hidden activities that reveal in a transition will activate an "enter" animation. Visible Activities hidden in a transition will activate an "exit" animation.
-=======
 - If an Activity is rendered inside of a [ViewTransition](/reference/react/ViewTransition), and it becomes visible as a result of an update caused by [startTransition](/reference/react/startTransition), it will activate the ViewTransition's `enter` animation. If it becomes hidden, it will activate its `exit` animation.
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 ---
 
 ## Usage {/*usage*/}
 
 ### Restoring the state of hidden components {/*restoring-the-state-of-hidden-components*/}
 
-<<<<<<< HEAD
-Typically in React, when you want to conditionally show or hide a component, you mount and unmount it:
-=======
 In React, when you want to conditionally show or hide a component, you typically mount or unmount it based on that condition:
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 ```jsx
 {isShowingSidebar && (
@@ -100,19 +88,12 @@ When you hide a component using an Activity boundary instead, React will "save"
 </Activity>
 ```
 
-<<<<<<< HEAD
-This makes it possible to restore components to their previous state.
 
-The following example has a sidebar with an expandable section – you can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
-
-Try expanding the Overview section, then toggling the sidebar closed and open:
-=======
 This makes it possible to hide and then later restore components in the state they were previously in.
 
 The following example has a sidebar with an expandable section. You can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
 
 Try expanding the Overview section, and then toggling the sidebar closed then open:
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
 
 <Sandpack>
 

src/sidebarHome.json

@@ -15,17 +15,8 @@
       "path": "/learn/installation"
     },
     {
-<<<<<<< HEAD
       "title": "کامپایلر ری‌اکت",
       "path": "/learn/react-compiler"
-=======
-      "title": "React Compiler",
-      "path": "/learn/react-compiler"
-    },
-    {
-      "hasSectionHeader": true,
-      "sectionHeader": "LEARN REACT"
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
     },
     {
       "hasSectionHeader": true,
@@ -89,27 +80,7 @@
     },
     {
       "hasSectionHeader": true,
-<<<<<<< HEAD
       "sectionHeader": "API کامپایلر ری‌اکت"
-=======
-      "sectionHeader": "REACT COMPILER API"
-    },
-    {
-      "title": "Configuration",
-      "path": "/reference/react-compiler/configuration"
-    },
-    {
-      "title": "Directives",
-      "path": "/reference/react-compiler/directives"
-    },
-    {
-      "title": "Compiling Libraries",
-      "path": "/reference/react-compiler/compiling-libraries"
-    },
-    {
-      "hasSectionHeader": true,
-      "sectionHeader": "GET INVOLVED"
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
     },
     {
       "title": "پیکربندی",

src/sidebarLearn.json

@@ -57,16 +57,11 @@
       ]
     },
     {
-<<<<<<< HEAD
       "title": "کامپایلر ری‌اکت",
-=======
-      "title": "React Compiler",
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
       "path": "/learn/react-compiler",
       "canary": true,
       "routes": [
         {
-<<<<<<< HEAD
           "title": "مقدمه",
           "path": "/learn/react-compiler/introduction"
         },
@@ -80,21 +75,6 @@
         },
         {
           "title": "دیباگ و رفع اشکال",
-=======
-          "title": "Introduction",
-          "path": "/learn/react-compiler/introduction"
-        },
-        {
-          "title": "Installation",
-          "path": "/learn/react-compiler/installation"
-        },
-        {
-          "title": "Incremental Adoption",
-          "path": "/learn/react-compiler/incremental-adoption"
-        },
-        {
-          "title": "Debugging and Troubleshooting",
->>>>>>> 2774ddfa0c39b8c2f0563b987dcb90a01ee723cf
           "path": "/learn/react-compiler/debugging"
         }
       ]