hexo github

2016-03-09

hexo & github

一开始没有搞懂.deploy_git和.git的区别
后来发现hexo deploy到github上的内容只有纯粹的网页
才大致明白了hexo的工作流程

首先
hexo并没有生成页面文件
项目目录中除了配置文件以外就只有hex new出来的一些.md而已
hexo generate之后才会在public目录下生成一系列html，css等页面文件

hexo deploy之后
hexo才会将所有页面文件push到项目的master分支(在/_config.yml中指定)上
网站因而得以运作

但是这样一来
只有页面文件被放到了远程库
为了将配置文件和.md也放到Github
可以新建一个hexo分支来存放

git checkout -b hexo
git push origin hexo:hexo

这样一来
对hexo所做的修改也可以托管在Github上了

以后只需在hexo g生成页面后
先用hexo d发布到网站（即master分支）
然后add-commit-push所有改动到hexo分支

push conflict

不过在实际的第二次push时
出现了冲突

$ git push origin hexo:hexo
To git@github.com:answerrrrrrrrr/answerrrrrrrrr.github.com.git
 ! [rejected]        hexo -> hexo (non-fast-forward)
error: failed to push some refs to 'git@github.com:answerrrrrrrrr/answerrrrrrrrr.github.com.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

参考廖雪峰的文章得以解决

$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details
    git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
    git branch --set-upstream-to=origin/<branch> hexo
$ git branch --set-upstream hexo origin/hexo
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
Branch hexo set up to track remote branch hexo from origin.
$ git pull
Auto-merging index.html
CONFLICT (add/add): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
$ git status
On branch hexo
Your branch and 'origin/hexo' have diverged,
and have 1 and 1 different commit each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")
Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      index.html
no changes added to commit (use "git add" and/or "git commit -a")
$ subl index.html
$ git add .
$ git commit -m 'index'
	[hexo b7ed9be] index
$ git push origin hexo:hexo