Difficulty with first rake deploy

[Matthew Yanez]

$ rake deploy
(...omitted text...)
## Pushing generated _deploy website
Username for 'https://github.com': user
Password for 'https://us...@github.com':
To https://github.com/phxcs/phxcs.github.io.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/phxcs/phxcs.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart.

The rest of the error message suggests I merge with a git pull command, and doing so I get the response 'Already up to date.' I'm caught in an infinite push/pull loop.

This is my first attempted deploy. Per the documentation, I ran rake setup_github_pages and rake generate without trouble. When I first set up the github organization repo (phxcs.github.io), I used the page generator tool to generate my /index.html. I thought this was the cause of my trouble, so I deleted the repo and created a fresh one without using the site generator tool. However, I'm still encountering the same failure on the rake deploy step. Can anyone spot my oversight?

Best,

Matt

[Richard Hsu]

Try this

# sync local with Github

git pull origin master

rake deploy

-- Richard