今天操作git的时候,git stash了一下,然后git pull拉取最新的代码,发现居然报错了,报错如下:
$ git stash
fatal: Unable to create 'F:/TestSuite/TestSuite/.git/index.lock': File exists.
If no other git process is currently running, this probably means a
git process crashed in this repository earlier. Make sure no other git
process is running and remove the file manually to continue.
Cannot save the current index state
解决办法:
$ rm -f ./.git/index.lock
然后从新git stash ,发现解决了报错
$ git stash
Saved working directory and index state WIP on int: 192a5e0 Merge "TFS_128331:xxxx_comm_fix:使用PageObject重构FMRadio及Flashlight模块用例" into TestSuite_int
HEAD is now at 192a5e0 Merge "TFS_128331:xxxx_comm_fix:使用PageObject重构FMRadio及Flashlight模块用例" into TestSuite_int