Pregunta de entrevista de QBurst

How do you resolve git merge conflict issue?