What I Learned From Hosting Octopress on GitHub
So, Octopress is a “blogging framework for hackers”, and I “should be comfortable running shell commands and familiar with the basics of Git. If that sounds daunting, Octopress probably isn’t for you”. I’m not comfy with shell commands, and yes, it sounds daunting. I went to Codecademy to try to learn some Ruby. Codecademy is an awesome site, but I feel like unless I really tackle Octopress, I won’t even know what the hell I’m trying to learn with Ruby. So, I decided to just wing it…
Anyways, I was trying to deploy Octopress via my github pages, and I got kicked in the balls, hard. I kept on getting this error after I do a rake deploy:
! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/yeesterbunny/yeesterbunny.github.com.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 resolved this by going to _deploy folder:
Since the master branch is inside deploy, I did a:
git pull origin master
I then resolved conflicts, and pushed the commit. Now, I return to octopress folder:
again, and everything starts working. Yay~!
Happy blogging XDDDDDDDD