re: Great article :) I'd add some note about git pull --rebase, it often works more cleanly than normal pull. Also, probably worth mentioning is that...
 

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!

code of conduct - report abuse