Session abstract:

In this talk we will be discussing advanced git techniques, how you can utilize different branching strategies to achieve a rapid workflow depending on the structure of your team (and demonstrating the branching strategy the Android team uses at Shazam), followed by an assortment of 'hacks', or useful tricks, that allow you to optimize the way you work and share code with others.