Loading Depth Study
Preparing your workspace
A merge conflict occurs when Git cannot automatically combine competing changes to the same part of a file or related history.
Git can automatically merge many changes, but sometimes two branches modify the same lines in incompatible ways. Git marks the conflicting area and pauses the merge. The developer must inspect the intended final version, remove the conflict markers, test the result, and then stage the resolved file. A good conflict-resolution process focuses on the intended behavior rather than simply choosing one side blindly.
Two developers may edit the same component at the same time. When their branches are merged, Git may ask the team to choose or combine the intended changes.
<<<<<<< HEAD <h1>Courses</h1> ======= <h1>Available Courses</h1> >>>>>>> feature/course-title
The conflict markers show the two competing versions that need to be resolved manually.