sync-38b52cfd

Author: anilcanboga

package.json

@@ -35,11 +35,7 @@
     "classnames": "^2.2.6",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
-<<<<<<< HEAD
     "next": "16.1.5",
-=======
-    "next": "15.1.12",
->>>>>>> 38b52cfdf059b2efc5ee3223a758efe00319fcc7
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
     "react": "^19.0.0",

src/content/learn/separating-events-from-effects.md

@@ -568,11 +568,9 @@ label { display: block; margin-top: 10px; }
 
 </Sandpack>
 
-<<<<<<< HEAD
-Efekt olaylarını olay yöneticilerine çok benzer olarak düşünebilirsiniz. Temel fark, olay işleyicilerinin kullanıcı etkileşimlerine yanıt olarak çalışması, Efekt olaylarının ise sizin tarafınızdan Efektlerden tetiklenmesidir. Efekt olayları, Efektlerin tepkiselliği ile tepkisel olmaması gereken kod arasındaki "zinciri kırmanızı" sağlar.
-=======
-You can think of Effect Events as being very similar to event handlers. The main difference is that event handlers run in response to user interactions, whereas Effect Events are triggered by you from Effects. Effect Events let you "break the chain" between the reactivity of Effects and code that should not be reactive.
->>>>>>> 38b52cfdf059b2efc5ee3223a758efe00319fcc7
+Effect Events’i, event handler’lara oldukça benzer şekilde düşünebilirsiniz. Ana fark, event handler’ların kullanıcı etkileşimlerine yanıt olarak çalışması, Effect Events’in ise Effects içinden sizin tarafınızdan tetiklenmesidir.
+
+Effect Events, Effects’in reaktivitesi ile reaktif olmaması gereken kod arasındaki zinciri kırmanıza olanak tanır.
 
 ### Efekt olayları ile en son propları ve state okuma {/*reading-latest-props-and-state-with-effect-events*/}
 

yarn.lock

@@ -1250,17 +1250,10 @@
     unist-util-visit "^4.0.0"
     vfile "^5.0.0"
 
-<<<<<<< HEAD
 "@next/env@16.1.5":
   version "16.1.5"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-16.1.5.tgz#83740cf3a0e617848c53c154b41cf141f0f536ca"
   integrity sha512-CRSCPJiSZoi4Pn69RYBDI9R7YK2g59vLexPQFXY0eyw+ILevIenCywzg+DqmlBik9zszEnw2HLFOUlLAcJbL7g==
-=======
-"@next/env@15.1.12":
-  version "15.1.12"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.1.12.tgz#0821510fa71871f1970cd216963d25a5970fe58a"
-  integrity sha512-EWKXZKsd9ZNn+gLqOtfwH2PQyWuWFmpLldjStw7mZgWgKu56vaqNkAGQrys2g5ER4CNXEDz3Khj2tD1pnsT9Uw==
->>>>>>> 38b52cfdf059b2efc5ee3223a758efe00319fcc7
 
 "@next/eslint-plugin-next@12.0.3":
   version "12.0.3"
@@ -5913,22 +5906,12 @@ next-tick@^1.1.0:
   resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-<<<<<<< HEAD
 next@16.1.5:
   version "16.1.5"
   resolved "https://registry.yarnpkg.com/next/-/next-16.1.5.tgz#95c9bc91bfb1bb0d3f2d441fdbb550bf18939edf"
   integrity sha512-f+wE+NSbiQgh3DSAlTaw2FwY5yGdVViAtp8TotNQj4kk4Q8Bh1sC/aL9aH+Rg1YAVn18OYXsRDT7U/079jgP7w==
   dependencies:
     "@next/env" "16.1.5"
-=======
-next@15.1.12:
-  version "15.1.12"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.1.12.tgz#6d308fe6cb295faed724481b57f77b8abf4f5468"
-  integrity sha512-fClyhVCGTATGYBnETgKAi7YU5+bSwzM5rqNsY3Dg5wBoBMwE0NSvWA3fzwYj0ijl+LMeiV8P2QAnUFpeqDfTgw==
-  dependencies:
-    "@next/env" "15.1.12"
-    "@swc/counter" "0.1.3"
->>>>>>> 38b52cfdf059b2efc5ee3223a758efe00319fcc7
     "@swc/helpers" "0.5.15"
     baseline-browser-mapping "^2.8.3"
     caniuse-lite "^1.0.30001579"