Ford Motor Company interview question

How to handle git pull conflict?