Question d’entretien chez Fiserv

How do you resolve conflicts while committing code?