Problem Statement
What is a merge conflict and how do you resolve it?
Explanation
A conflict arises when Git can’t auto-merge edits (e.g., same line differs). Open files, choose the correct content, save, `git add` the fixes, then `git commit` (or `--continue`).
Practice Sets
This question appears in the following practice sets:
