Behind The Code ep.8 - You and your colleague Bart need to change the same file at the same time. How?

In the last video I've shown how Git can save your butt as an individual. What about teamwork though? As a software developer, you'll spend most of the time working in the team. It's a nice image we like to think about - being able to get done stuff by ourselves, but it's usually not the case.

In today's episode, I show you how to use Git for cooperation as a team rather than just working alone. Is it even possible to change the same file at the same time with keeping all changes? Or does it work on the old principle "the strongest win"?