I created the username.imtqy.com repository and I moved the current Octopress blog files to the master branch to track the changes I made to the entire blog.
Then I want it to appear in the gh-pages branch, so I used rake setup_github_pages , then rake generate and rake deploy[gh-pages] , but git rejected it with the following message:
To https://github.com/username/username.imtqy.com ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/username/username.imtqy.com' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (eg 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
How can i solve this? I want to put the _deploy folder in gh-pages and the rest in the master branch.
Is it possible?
user1685185
source share