title: Octopress deployment to gh-pages
body: <p>I made a <code>username.github.io</code> repo and I pushed my current Octopress blog files into the <code>master</code> branch so that I can track the changes I made to the whole blog.</p>
  
  <p>Next, I want it to appear in the <code>gh-pages</code> branch so I used <code>rake setup_github_pages</code>, then <code>rake generate</code> and <code>rake deploy[gh-pages]</code> but git rejected it with the following message:</p>
  
  <pre><code>To https://github.com/username/username.github.io
   ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'https://github.com/username/username.github.io'
  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.
  
  ## Github Pages deploy complete
  cd -
  </code></pre>
  
  <p>How do I solve this? I only want to put the <code>_deploy</code> folder in the <code>gh-pages</code> and the rest in the <code>master</code> branch.</p>
  
  <p>Is this even possible?</p>