Merge Conflict
A merge conflict happens when Git can't automatically combine two branches because the same lines of a file were changed differently in each. You must edit the file to choose the correct result.
Git & DevOps
Git marks the clashing sections with conflict markers: <<<<<<<, =======, and >>>>>>>. You edit the file to keep the right code, remove the markers, then stage and commit the resolution.
Conflicts are a normal part of collaboration, not an error you caused — they just mean two people touched the same spot.
Examples
Bash
git merge feature-loginOutput:
Auto-merging app.js
CONFLICT (content): Merge conflict in app.js
Automatic merge failed; fix conflicts and then commit the result.