Fidelity Investments interview question

How to handle Git conflicts?