Pregunta de entrevista de Commonwealth Bank of Australia

How will you resolve git conflict?