Pergunta de entrevista da empresa Veeva Systems

How do you resolve a merge conflict in GitHub?