Domanda di colloquio di TD

How is git branch merged in eclipse and conflicts resolved