Ok. I have fixed the issue. So I am gonna answer this myself.
The problem I was facing is because I was trying to fix the issue from the octopress directory, when I should be doing so from _deploy directory.
Upon running rake deploy
, octopress does cd _deploy
and tries push updates to Github(in my case). During that time I was getting the message 'You asked me to pull without telling me which branch you ...
'
After this, in the _deploy directory, I ran
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git pull
This fixed both errors (one described above, and the non-fast forward error). Now push this to remote, ( or run rake deploy
again ) .
This worked for me. If you have a better solution, I am open to changing the correct answer.