May 26th Git merge vs rebase is the new emacs vs vi / tabs vs spaces / pick your favorite religious war.