Git · Junior · Question 75 of 75
Two people edited different functions in the same file. What happens when their branches merge?
- ✓Correct answer: Git usually merges them automatically without a conflict
- 2The second branch overwrites the first one's changes
- 3Git always reports a conflict for the whole file
Explanation
Merging works on changed regions of lines, not whole files. Conflicts appear only when both sides changed the same or adjacent lines.