If Github is being stubborn you can always use :
git push -f origin <branch>
This will force it to push to the current branch.
Found this blog helpful for merging github master and gh-pages branches.
git log –stat Will show changes made from each commit.
git diff name of commit name of commit See differences made from each commit.
git clone url to clone repository