Ford Motor Company Interview Question

How to handle git pull conflict?