Question d’entretien chez TD

How is git branch merged in eclipse and conflicts resolved