Basically the 'Accept Merge Request' is not shown for all the Merge Requests irrespective of whether the branch has any conflicts or not.
On Tuesday, 31 May 2016 13:09:17 UTC+5:30, Venkataguru Mitta wrote: > > 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. > -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to gitlabhq+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/c759596a-aa36-45e3-b695-486cc02e7071%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
