NVIDIA Interview Question

How would you resolve merge conflicts in Git.