Pergunta de entrevista da empresa Personify

In the past, how have I handled merge conflicts?