Two developers can work on the same files at the same time and it doesn't have to be scary. Git Merge makes it easy to ensure we can see what's changed, where conflicts occurred and give us an opportunity to resolve them peacefully. In general, Git provides tools for rolling files back, isolating R&D initiatives and much much more. This session will focus on some more advanced Git commands and how we can use them in our daily projects to ensure source control is never a burden but an ally in getting work done quickly, easily and without interrupting other fellow developers.