During merge of a platform-client branch, Git stops because both sides edited the same function. Conflict markers appear in the file. What is the correct resolution path if the intent is to finish the merge?
Select an answer to reveal the explanation.
Short Explanation
Conflict markers are construction cones—you clear them, then finish the road join. Edit, stage, and complete the merge. reset --hard abandons the merge unless that is truly your intent.
Full Explanation
When Git stops for overlapping edits, resolution means manually fixing conflict markers, staging the corrected file, and completing the merge. git reset --hard discards the in-progress merge and is appropriate only when abandoning, not when finishing. Publishing unresolved markers is not a resolution.