Question

A cloud engineer maintains infrastructure code in a shared Git repository. Two teammates edited the same section of a Terraform module on separate branches. When the engineer attempts to merge the second branch into the main branch, Git halts the operation and flags the file with conflicting change markers. What must the engineer do before the merge can be completed?

Accepted Answer

Manually reconcile the conflicting lines in the affected file, then stage and commit the resolved result

Answer

Force-push the second branch to overwrite the main branch history

Answer

Delete the local repository and re-clone it from the remote origin

Answer

Run a hard reset on the main branch to discard all uncommitted work