Error - Another git process seems to be running in this repository- How to resolve?

+1 vote
asked May 6, 2018 by Hitesh Garg (799 points)  

I am trying to merge a latest branch from the server to my local branch and getting this error.

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.

I am using sourcetree to manually resolve the conflicts and the files are removed in the local version. But as soon as I try to resolve them, mark them as resolved, remove them I am getting the above-mentioned error.

I have closed the IDE in which I was working in and no other process is actually running on it.

Is there any way for me to fix this or should I just start a new repository?

1 Answer

+1 vote
answered May 6, 2018 by Rahul Singh (682 points)  
selected May 6, 2018 by Hitesh Garg
Best answer

Sometimes it happens because if IDE and some other tool including the command line try to run commands on the same repository but since you mentions that you have closed the IDE and other tools it doesn't seems to be an issue.
But there is one possibility that since you have mentioned that you have deleted the file and trying to resolve one it might be possible that the diff tool has acquired the lock.

Anyways try deleting the index.lock file in your .git directory.

Hope this helps.