First time using gh-pages on Github


Github Octacat

I have to say that Github literally makes me cry. Rivers. While moaning and screaming. Maybe. Luckily I had Ruben helping me the first time in creating my user page (eventually hoping to get to the stage Ruben is at, but hey, uni interferes), but this time I was doing it on my own (ambitious).

I've only really ever seen Ruben using the command line for git, since I had utterly no idea what he was doing that evening at the meeting where I spent more time watching him that paying attention to the meeting. As you do. Therefore I had no idea there was an automatic generator for Project pages. Maybe he used it while I had gone off to discuss something with someone, but all the same, I ended up trying to make them manually.

Which spat continuous errors in my face that I didn't understand and couldn't find an answer for:

# On branch master

Your branch is ahead of 'origin/master' by 1 commit.

(use "git push" to publish your local commits)

nothing to commit, working directory clean

and...

[gh-pages (root-commit) ba2fccc] first pages commit
 2 files changed, 10 insertions(+)
 create mode 100644 _posts/2013-08-21-testing.html
 create mode 160000 dmst
To https://github.com/ctse/dmst.git
 ! [rejected]        gh-pages -> gh-pages (non-fast-forward)
error: failed to push some refs to 'https://github.com/ctse/dmst.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I deleted the branch and tried to make it again multiple times with no dice and couldn't find anything that solved my problem of my branch being ahead/the master branch being behind... so, as I lacked understanding of whatinthefudginghell was was going on, I just started a new fresh repo, created the branch and then copied over the Jekyll files and committed them. Yay~

If someone could tell me what I did wrong, that would be nice. orz