Pergunta de entrevista da empresa Fidelity Investments

How to handle Git conflicts?