Basic tutorial showing the differences between `git rebase` and `git merge` - View it on GitHub