DevOps Tools Engineer (LPIC-OT 701) — Question 24

What happens when a merge conflict occurs in git? (Choose two correct answers.)

Answer options

• 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: D, E

Explanation

When a merge conflict occurs in git, the affected files are flagged as conflicting, which is why option D is correct. Option E is also correct because the newest version is indeed placed in the local repository. Options A, B, and C are incorrect; the files do not remain unchanged, conflict markers are not automatically added, and a new branch is not created for remote changes.