我已经用Octopress在github页面上设置了一个博客。我已经创建了我的第一篇文章,并且能够使用rake preview
在本地主机上查看它。然而,它未能部署到github页面。作为git的新手,我很难理解这个问题。
我根据它们的documentation运行rake deploy
来部署到github页面。
我得到了这样的信息:
## Deploying branch to Github Pages
## Pulling any updates from Github Pages
cd _deploy
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "master"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
cd -
rm -rf _deploy/blog
rm -rf _deploy/robots.txt
rm -rf _deploy/javascripts
rm -rf _deploy/stylesheets
rm -rf _deploy/sitemap.xml
rm -rf _deploy/favicon.png
rm -rf _deploy/atom.xml
rm -rf _deploy/index.html
rm -rf _deploy/images
rm -rf _deploy/assets
## Copying public to _deploy
cp -r public/. _deploy
cd _deploy
## Committing: Site updated at 2014-01-25 20:13:51 UTC
# On branch master
nothing to commit (working directory clean)
## Pushing generated _deploy website
To git@github.com:slmnm/slmnm.github.io.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:slmnm/slmnm.github.io.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
## Github Pages deploy complete
cd -
在this question之后,我将我的branch.master.remote
设置为origin
。为了解决非快进的情况,我执行了did git push origin master
。在此之后,我可以将代码推送到github,但不能使用rake deploy
部署到github页面。
我打算在这里粘贴我的git配置文件,我不知道这是否会有帮助。
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "octopress"]
url = git://github.com/imathis/octopress.git
fetch = +refs/heads/*:refs/remotes/octopress/*
[branch "source"]
remote = origin
merge = refs/heads/master
[remote "origin"]
url = git@github.com:slmnm/slmnm.github.io.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
正如你可能已经猜到的,我是一个人在做这件事,并且没有合作者(嗯!博客)。这是我的repo。如果您需要任何其他细节,请让我知道。我是个git newb :)谢谢
编辑:我还收到了一封来自github的电子邮件,内容如下:
页面生成失败,出现以下错误:
source/blog/archives/index.html
中包含的文件是符号链接或在您的_includes
目录中不存在。
这种情况只发生过一次,尽管我已经尝试过多次部署。
https://stackoverflow.com/questions/21356212
复制相似问题