This is above-average for Git how-to blog posts. It covers a bunch of atomic little points, so you can just skip over the ones you already know. I gleaned a couple new tricks from it.<p>Speaking of which, if you're using Emacs and doing this:<p><i>editing the file, removing the <<<<, ====, >>>> markers and the keeping the code you want to store</i><p>... consider using SMerge minor mode. I've developed a strong bias against merge GUIs over the years, but this one is very minimal -- which turns out to be a good thing -- and doesn't mess me up.