gitQ&A

gitQ&A

Q:Hexo搭建博客，在仓库中直接创立CNAME文件，紧接着提交仓库时候，报出如下错误：

Error —
To https://github.com/aniruddhabarapatre/learn-rails.git
! [rejected]master -master (fetch first)
error: failed to push some refs to ‘https://github.com/aniruddhabarapatre/learn-rails.git’
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first merge the remote changes (e.g.,
hint: ‘git pull’) before pushing again.
hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details.

A：git push origin master改为git push origin master –force

Q：使用上述git push origin master –force后，解决上述error，但是当访问远程仓库是CNAME文件被干掉，并且相应域名访问报404错误.

A:这是因为本地的博客工程里面还没有CNAME，当我们重新部署后，远程的博客工程会和本地保持同步，将CNAME文件删除，所以我们要在本地添加CNAME文件，然后git push origin master(使用正常运行下命令即可)，再次访问相应域名，一切正常！

参考文章：http://stackoverflow.com/questions/20939648/issue-pushing-new-code-in-github

http://www.jianshu.com/p/cea41e5c9b2a