Solved

What Happens When a Merge Conflict Occurs in Git

Question 40

Multiple Choice

What happens when a merge conflict occurs in git?


A) The conflicting files remain unchanged in the local repository.
B) Conflict markers are added to the files.
C) A new branch containing the remote changes is created.
D) The affected files are flagged as conflicting.
E) The newest version is placed in the local repository.

Correct Answer:

verifed

Verified

Unlock this answer now
Get Access to more Verified Answers free of charge

Related Questions