记录一次git错误

git pull出现如下错误：

pull is not possible because you have unmerged files. please fix them up in the work tree

解决办法：

首先通过 git status查看哪个文件冲突了，比如：

➜  butler git:(master) ✗ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 38 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")
Changes to be committed:
	modified:   butler-console/pom.xml
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   butler-tlog/src/main/resources/biz.properties

其中/biz.properties 冲突，编辑文件解决冲突之后，通过

git add butler-tlog/src/main/resources/biz.properties && git commit -m "removed merge conflicts"

标记冲突已解决。

 

参考：

http://stackoverflow.com/questions/26376832/why-does-git-say-pull-is-not-possible-because-you-have-unmerged-files

http://www.cnblogs.com/highriver/archive/2012/01/06/2314175.html