Unable to handle Merge Requests.

[Venkataguru Mitta]

We are using internally hosted instance of GitLab 7.1.0.

All of a sudden in the Merge requests page, always see below message irrespective of whether the branch has any merge conflicts or not which is blocking the admins to merge the code into upstream.

This request can't be merged with GitLab.

You should do it manually with command line

In the githost.log, see below error but not sure if it is related to this issue.

Command failed [128]: /usr/local/bin/git --git-dir=/repo/gitlab-satellites/xx/yyyy/.git --work-tree=/repo/gitlab-satellites/xx/yyyy checkout -b develop origin/develop


fatal: Unable to create '/repo/gitlab-satellites/xx/yyyy/.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.

Appreciate any inputs to resolve this issue.

[Venkataguru Mitta]

Basically the 'Accept Merge Request' is not shown for all the Merge Requests irrespective of whether the branch has any conflicts or not.

[Magnus Therning]

Have you attempted to simply follow the instructions in the message,
i.e. to remove the index.lock file?

/M

--
Magnus Therning, magnus....@cipherstone.com
Cipherstone Technologies AB
Theres Svenssons gata 10, 417 55 Gothenburg, Sweden

You know, take Lisp. You know, it’s the most beautiful language in the
world. At least up until Haskell came along.
— Larry Wall

[Guru Mitta]

Yes, I did remove the lock file but unfortunately it didn't work even after restarting the gitlab instance.