During a merge conflict in the city's Meraki SSID helper repo, an engineer decides the entire conflicting file from the incoming branch is correct. Which resolution completes the merge cleanly?
Select an answer to reveal the explanation.
Short Explanation
When one side's whole file is the truth, check that path out from the winner, stage it, and complete the merge. You are still resolving a conflict—not inventing a new Git verb.
Full Explanation
Official DEVCOR Git coverage includes merge, conflict resolution, checkout, reset, and revert. Checking out the desired path from the correct side, staging, and finishing the merge is a standard resolution tactic. Cherry-pick is outside this bank's canon list for this judgment, and hard-reset or deleting without staging leaves the merge incomplete or destructive.