Git常见错误（附解决办法）

1.Unable to create ‘F:/Git/.git/index.lock’: File exists.

$ git add doc-public
fatal: Unable to create 'F:/Git/.git/index.lock': File exists.
解决办法：
执行
$ rm -f .git/index.lock
再提交
$ git add doc-public

2.committing is not possible because you have unmerged files.

Committing is not possible because you have unmerged files. 由于您没有合并的文件，因此无法提交。

解决方法 用git diff或者git status 查看哪些文件冲突，有冲突的会提示： ++