How resolve a merge conflict step by step?

Resolve merge conflicts

For How resolve a merge conflict step by step, interviewers listen for a crisp definition, how the pieces interact in a real system, and one trade-off or failure mode you have seen or would guard against.

• git pull / merge → conflict markers <<<<<<<
• Edit file to final intended content
• git add resolved files; git commit
• Run tests before push