Pergunta de entrevista da empresa Axelspace

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