»Git without conflicts (in Portuguese)«
2019-08-03, 15:05–15:45, Radisson Madrid

Who have never deleted a whole directory after messing up the git history and preferred to re-do all the changes manually? Git can be pretty hard for beginners or even for experienced developers who use it regularly but never had the chance to understand how git really works and ends up having little panic attacks when facing merge conflicts. Instead of being your enemy, if used wisely git can be a powerful time machine. In this talk, I intend to go a little deeper into how git works, share some git hacks beyond "add, commit, and push" and make everyone a bit less scared to solve conflicts!