Pregunta de entrevista de Think Future Technologies

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