I forked Phlow’s excellent “Feeling Responsive” repository about a month ago, to create this website. I hacked away at config files, added posts, and deleted demo data.
This is a companion discussion topic for the original entry at https://www.funkypenguin.co.nz/how-to/2015/04/08/git-merge-a-forked-repo-with-upstream-changes.html