Michael, I saw you merged the site branch. I had been thinking of instead doing a rebase.
I did a test rebase a few days ago and was pleased to see that it went smoothly — meaning that every commit in “site” had also been made to “master” — and it ended up pointing to the same commit as master. In my opinion, merge commits are fine in personal repos but they are not great in public repos because they usually obfuscate history. (Maybe I just haven’t found the right tools to view them.) In this case, I think ‘git checkout site; git rebase origin/master; git push origin site’ would have been better. Julian
