One of the 100 questions in this topic
How much do you know about Git and Version Control?A merge conflict occurs when two branches have modified the same part of a file differently and Git cannot automatically determine which change should prevail. It requires manual intervention before completing the merge.