Conflict Resolution

Summary

The process of manually reconciling two competing changes to the same lines of code when Git can't automatically merge them. Conflicts are not inherently errors; they indicate that Git needs a human to decide how independently changed versions of the same content should be combined.

• 1Deliberately create a merge conflict between two branches and resolve it by hand. Validate your understanding by applying it in a small practical example.
• 2Learn to read the `<<<<<<<`, `=======`, `>>>>>>>` conflict markers confidently. Focus on understanding the underlying reason it works, not only memorizing the definition.
• 3Use your editor's merge conflict UI (VS Code has a good one) instead of raw text editing.