Why not B ?
Git adds standard conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflict.
Source: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts
Per previous comments. Conflicts markers are added to files, and they are flagged as conflicted. E is not 100% correct, since conflicted files won't be the "newest". "newest" is also ambiguous, since you may be merging a branch that was developed years ago.
What is wrong with the option "B. Conflict markers are added to the files."?
upvoted 3 times
...
Log in to ExamTopics
Sign in:
Community vote distribution
A (35%)
C (25%)
B (20%)
Other
Most Voted
A voting comment increases the vote count for the chosen answer by one.
Upvoting a comment with a selected answer will also increase the vote count towards that answer by one.
So if you see a comment that you already agree with, you can upvote it instead of posting a new comment.
[Removed]
Highly Voted 1 year, 6 months agoexamtp1
Most Recent 4 months agohythalo
2 years, 2 months ago