Question d’entretien chez GitHub

How do you handle conflicts?