无法在GitLab上执行合并请求

时间:2014-08-05 07:32:15

标签: gitlab

将GitLab从6.2升级到7.1。我不能做合并请求。它告诉我没有任何合并(但当然有)。

Merge request picture

系统信息:

System information
System:     
Current User:   git
Using RVM:  no
Ruby Version:   2.1.2p95
Gem Version:    2.2.2
Bundler Version:1.6.5
Rake Version:   10.3.2
Sidekiq Version:2.17.0

GitLab information
Version:    7.1.1
Revision:   facfec4
Directory:  /home/git/gitlab
DB Adapter: mysql2
URL:        <not showing>
HTTP Clone URL: <not showing>
SSH Clone URL:  <not showing>
Using LDAP: no
Using Omniauth: no

GitLab Shell
Version:    1.9.6
Repositories:   /home/git/repositories/
Hooks:      /home/git/gitlab-shell/hooks/
Git:        /usr/bin/git

2 个答案:

答案 0 :(得分:0)

存储库/ .git / config文件存在问题。没有GitLab相关。

答案 1 :(得分:0)

请检查日志文件githost.log

你会明白的。

溶液:

这样做:

git checkout master

如果没有修复它,则会:

git checkout -b temp

git branch -f master temp

git checkout master

参考:How can I reconcile detached HEAD with master/origin?