Question d’entretien chez QBurst

How do you resolve git merge conflict issue?