Pergunta de entrevista da empresa Nokia

How a merging and conflict solving process in Git looks like? What do you know about Spring?