Merge request not finishing
Created by: SteveyPugs
I was trying to do merge requests on my CE server (7.3.2) but now they are in a state of limbo, not closed not open but not processing...
The only issues I had before in the githost.log were these but I'm pretty sure I clean this up.
October 17, 2014 10:02 -> ERROR -> Command failed [128]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/web-development/bondcompro-website/.git --work-tree=/home/git/gitlab-satellites/web-development/bondcompro-website checkout -b master origin/master
fatal: A branch named 'master' already exists.
October 17, 2014 10:20 -> ERROR -> Command failed [128]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/web-development/bondcompro-website/.git --work-tree=/home/git/gitlab-satellites/web-development/bondcompro-website checkout -b master origin/master
fatal: Unable to create '/home/git/gitlab-satellites/web-development/bondcompro-website/.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.
October 17, 2014 10:21 -> ERROR -> Command failed [128]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/web-development/bondcompro-website/.git --work-tree=/home/git/gitlab-satellites/web-development/bondcompro-website merge --no-ff -mMerge branch 'docx-fix' into 'master' source/docx-fix
fatal: Unable to create '/home/git/gitlab-satellites/web-development/bondcompro-website/.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.
October 17, 2014 10:44 -> ERROR -> Grit::Git::GitTimeout
Any help? I've looked at some issues that relate to this but nothing is working