git常见问题解决

1、​报错fatal: Unable to create '.git/index.lock': File exists.解决办法

http://www.findme.wang/blog/detail/id/454.html

在使用git操作的时候，报错fatal: Unable to create '.git/index.lock': File exists.如下：

fatal: Unable to create '/home/dequan/test/.git/index.lock': File exists.

Another git process seems to be running in this repository, e.g.

an editor opened by 'git commit'. Please make sure all processes

are terminated then try again. If it still fails, a git process

may have crashed in this repository earlier:

remove the file manually to continue.

导致报错的原因：git在进行比较费时的操作时候，会在.git目录下面创建一个index.lock文件，相当于一个文件锁，防止重复的操作。当操作结束后，会删除index.lock文件。当强制关闭进行中的git操作，这个文件可能不会自动删除。

解决办法：手动删除即可。

1	rm .git/index.lock

 

2、回退本地代码后再更新本地代码：
git reset --hard head
git clean -df
git pull