Merge conflicts with Git

At TIM Group we have a weekly meeting for sharing 5 minute long Lightning talks

This is one of those talks and accompanying slides: a basic introduction to the workflow for resolving conflicts during a merge with Git