Pregunta de entrevista de Fiserv

How do you resolve conflicts while committing code?