What happens when a merge conflict occurs in git?

B. When a merge conflict occurs, Git inserts conflict markers into the files to indicate the conflicting sections.

D. The files with conflicts are marked as conflicted in the repository, and you need to manually resolve the conflicts before completing the merge.

References:

Git Documentation - Merge Conflicts

Resolving Merge Conflicts