Infosys interview question

How do you handle conflict in GIT