What happens when a merge conflict occurs in git? (Choose two correct answers.)
What happens when a merge conflict occurs in git? (Choose two correct answers.)
When a merge conflict occurs in git, conflict markers are added to the affected files to indicate where the conflicts are. Additionally, the affected files are flagged as conflicting so that the user can identify and manually resolve the issues. The conflicting files don't automatically update to the newest version, nor is a new branch created; the user must manually resolve the conflicts and commit the changes.
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
What is wrong with the option "B. Conflict markers are added to the files."?
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.