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?