Fidelity Investments Interview Question

How to handle Git conflicts?