Pergunta de entrevista da empresa Commonwealth Bank of Australia

How will you resolve git conflict?