Question d’entretien chez Vodafone

How do we resolve a merge conflict on git ?