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

+1 vote
102 views
asked May 7, 2018 by Hitesh Garg (352 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 7, 2018 by Rahul Singh (543 points)  
selected May 7, 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.

124 questions

41 answers

3 comments

926 users

Most popular tags

java python python3 oracle database java-8 sql-server python2 oracle11g git oracle-12g command-line maven sql-server-2012 sql input array list fenitoina dilantin javaçš„ angular javascripts git-branch intellij-idea hashmap collection file-io io temovate clobetasol ampicillin principen daclatasvir daklinza vasotec enalapril nexium esomeprazole tadalafil tadlis sildenafil citrate pefomax xeloda capecitabina clobetasol temovate stemetil prochlorperazine methotrexate methotrexate sildenafilo y dapoxetina super kamagra norvasc amlodipine citalopram celexa amitriptylin saroten vitamin b12 methylcobalamin valaciclovir valtrex zudena udenafil sildenafil citrate vigour depakote divalproex retin-a tretinoine sildenafil citrate ip-max nizoral ketoconazol ciaton tadalafil norethisteronacetat aygestin indomethacin indocin tiova tiotropium bromid finasterida proscar lithium carbonate eskalith finasterida propecia levitra vardenafil vantin cefpodoxima loxitane loxapine rulide roxithromycine avodart dutasterid tecnomax sildenafil citrate methylcobalamin vitamin b12 permethrin acticin etinilestradiol norgestrel ovral pk-merz amantadin cycrin medroxyprogesterone serophene clomiphene spironolactone aldactone mesalazin pentasa zebeta bisoprolol cytodrox hydroxyurea ampicillin ampicillin pletal cilostazol paracetamol panadol pepcid famotidina meclizine hydrochloride antivert donaton tadalafil sdf dsfs sdgfgsdg mac null-pointer-exception constructor oracle-12c terminal hibernate-5 hibernate git-merge es6 programming git-amend git-commit java-stream git-remote multithreading access-modifiers nested-classes
Welcome to Codingeek Q&A, where you can ask questions and receive answers from other members of the community.
...