Glassbox interview question

How do you handle git conflicts while working on a team?