Great article :)
I'd add some note about git pull --rebase, it often works more cleanly than normal pull.
git pull --rebase
Also, probably worth mentioning is that git gives a (experienced) developer a lot more tools to fix when something went wrong. This means that if someone screws up it's relatively easy to fix it in git, compared to other VCS (for me that is the main argument for git against any other version control system)
I do like rebase in many cases (even if it might mess up the history a small bit), but I choose to leave it out in this part, as it's a slight bit over the general level of the text, hehe. A good point though!
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.