Pergunta de entrevista da empresa Think Future Technologies

When does a merge conflict occurs in git? How do you resolve it?