Can not do merge request on GitLab

问题:

After updating GitLab from 6.2 to 7.1. I can not do merge requests. It tells me that there isn't anything to merge (but ofcourse there are).

System info:

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

回答1:

It was a problem with repository/.git/config file. Nothing GitLab related.

回答2:

Please check the log file githost.log

and you will understand it.

solution:

Just do this:

git checkout master

If that hasn't fixed it, this will:

git checkout -b temp

git branch -f master temp

git checkout master

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