Unable to complete merge request on GitLab
After upgrading GitLab from 6.2 to 7.1. I am unable to execute union requests. This tells me that there is nothing to merge (but of course there is).
System Information:
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
+3
source to share
2 answers
Check the log file githost.log
and you will understand it.
decision:
Just do this:
git checkout master
If not fixed, it would be:
git checkout -b temp
git branch -f master temp
git checkout master
Reference: How can I link a separate HEAD with master / origin?
0
source to share