docs: resolve conflicts

lumirlumir · lumirlumir · commit e4ded404ebdd · 2025-03-18T00:26:31.000+09:00
diff --git a/src/content/reference/react-dom/components/input.md b/src/content/reference/react-dom/components/input.md
@@ -297,11 +297,8 @@ input { margin: 5px; }
 
 <Pitfall>
 
-<<<<<<< HEAD
 기본적으로 `<form>` 내부의 *어느* `<button>`이든 폼을 제출합니다. 뜻밖인가요? 커스텀 `Button` React 컴포넌트의 경우 `<button>` 대신 [`<button type="button">`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/button) 반환을 고려하세요. 명시성을 부여하기 위해 폼 제출용 버튼으로는 `<button type="submit">`을 사용하세요.
-=======
 By default, a `<button>` inside a `<form>` without a `type` attribute will submit it. This can be surprising! If you have your own custom `Button` React component, consider using [`<button type="button">`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button) instead of `<button>` (with no type). Then, to be explicit, use `<button type="submit">` for buttons that *are* supposed to submit the form.
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
 
 </Pitfall>
 
diff --git a/src/content/reference/react-dom/components/style.md b/src/content/reference/react-dom/components/style.md
@@ -51,15 +51,12 @@ React는 `<style>` 컴포넌트를 문서의 `<head>`로 이동시키고, 동일
 
 이러한 처리는 두 가지 주의 사항이 있습니다.
 
-<<<<<<< HEAD
 * 스타일이 렌더링된 후에는 React가 속성 변경을 무시합니다. (개발 중에 이 상황이 발생하면 React는 경고를 표시합니다.)
 
 * 스타일을 렌더링한 컴포넌트가 마운트 해제된 후에도 DOM에 스타일이 유지될 수 있습니다.
-=======
 * React will ignore changes to props after the style has been rendered. (React will issue a warning in development if this happens.)
 * React will drop all extraneous props when using the `precedence` prop (beyond `href` and `precedence`).
 * React may leave the style in the DOM even after the component that rendered it has been unmounted.
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
 
 ---
 
diff --git a/src/content/reference/react-dom/static/prerender.md b/src/content/reference/react-dom/static/prerender.md
@@ -229,11 +229,7 @@ async function renderToString() {
   const {prelude} = await prerender(<App />, {
     bootstrapScripts: ['/main.js']
   });
-<<<<<<< HEAD
 
-=======
-  
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
   const reader = prelude.getReader();
   let content = '';
   while (true) {
@@ -295,10 +291,6 @@ Suspense-enabled data fetching without the use of an opinionated framework is no
 
 ### My stream doesn't start until the entire app is rendered {/*my-stream-doesnt-start-until-the-entire-app-is-rendered*/}
 
-<<<<<<< HEAD
-The `prerender` response waits for the entire app to finish rendering, including waiting for all suspense boundaries to resolve, before resolving. It is designed for static site generation (SSG) ahead of time and does not support streaming more content as it loads.
-=======
-The `prerender` response waits for the entire app to finish rendering, including waiting for all Suspense boundaries to resolve, before resolving. It is designed for static site generation (SSG) ahead of time and does not support streaming more content as it loads. 
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
+The `prerender` response waits for the entire app to finish rendering, including waiting for all Suspense boundaries to resolve, before resolving. It is designed for static site generation (SSG) ahead of time and does not support streaming more content as it loads.
 
 To stream content as it loads, use a streaming server render API like [`renderToReadableStream`](/reference/react-dom/server/renderToReadableStream).
diff --git a/src/content/reference/rsc/server-components.md b/src/content/reference/rsc/server-components.md
@@ -299,8 +299,5 @@ function Comments({commentsPromise}) {
 
 `note` 콘텐츠는 페이지 렌더링에 중요한 데이터이므로 서버에서 `await` 합니다. 댓글은 중요도가 낮아 페이지 아래에 표시되므로 서버에서 Promise를 시작하고 클라이언트에서 `use` API를 사용하여 기다립니다. 이는 클라이언트에서 지연되지만 `note` 콘텐츠가 렌더링되는 것을 차단하지 않습니다.
 
-<<<<<<< HEAD
 비동기 컴포넌트는 [클라이언트에서 지원되지 않으므로](#why-cant-i-use-async-components-on-the-client) Promise를 `use`로 기다립니다.
-=======
 Since async components are not supported on the client, we await the promise with `use`.
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
diff --git a/src/sidebarLearn.json b/src/sidebarLearn.json
@@ -25,17 +25,12 @@
       "path": "/learn/installation",
       "routes": [
         {
-<<<<<<< HEAD
-          "title": "새로운 React 프로젝트 시작하기",
-          "path": "/learn/start-a-new-react-project"
-=======
-          "title": "Creating a React App",
+          "title": "새로운 React 앱 만들기",
           "path": "/learn/creating-a-react-app"
         },
         {
           "title": "Build a React App from Scratch",
           "path": "/learn/build-a-react-app-from-scratch"
->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
         },
         {
           "title": "기존 프로젝트에 React 추가하기",

Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,12 @@`
`25`	`25`	`"path": "/learn/installation",`
`26`	`26`	`"routes": [`
`27`	`27`	`{`
`28`		`-<<<<<<< HEAD`
`29`		`- "title": "새로운 React 프로젝트 시작하기",`
`30`		`- "path": "/learn/start-a-new-react-project"`
`31`		`-=======`
`32`		`- "title": "Creating a React App",`
	`28`	`+ "title": "새로운 React 앱 만들기",`
`33`	`29`	`"path": "/learn/creating-a-react-app"`
`34`	`30`	`},`
`35`	`31`	`{`
`36`	`32`	`"title": "Build a React App from Scratch",`
`37`	`33`	`"path": "/learn/build-a-react-app-from-scratch"`
`38`		`->>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff`
`39`	`34`	`},`
`40`	`35`	`{`
`41`	`36`	`"title": "기존 프로젝트에 React 추가하기",`