Tutorial
Commands summary
Know the power of rebase
Rebase or merge
How to handle conflicts
Conclusion