Pregunta de entrevista de Fidelity Investments

How to handle Git conflicts?