Pregunta de entrevista de Axelspace

How do you merge and solve conflicts? How about code review?