Question

How do you resolve a merge conflict?

Answer 1

When a merge conflict occurs, Git will mark the conflicting areas in the affected files. You need to manually edit these files to resolve the conflicts and then stage the resolved files with git add and complete the merge with git commit.