1.今天 当我 执行 Git add somefile 的时候,出现 如下 错误:
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.
解决方法:
rm -f ./.git/index.lock
2.用git进行 commit本地代码时候,如果提交的是批量操作,如果个别文件有冲突,想要解决冲突,那么
保留=======下面的代码,删除=======上面的代码