How do you resolve Git merge conflicts?

A merge conflict happens when Git can’t automatically combine changes. **Steps:** 1) Run `git status` to see conflicted files. 2) Open the file and find conflict markers `<<<<<<<`, `=======`, `>>>>>>>`. 3) Decide the correct final code (choose one side or combine). 4) Remove markers, run tests. 5) `git add` and complete the merge (`git commit` or continue rebase). **Prevent conflicts:** smaller PRs, frequent pulls, clear ownership, and avoiding long-lived branches.