Hi, We are periodically seeing a problem creating merge requests in Gitlab 7.1. The merge page unexpectedly reports that there are no changes between the branches.
The merge is from a bugfix branch of develop on a developers fork of the official repository to develop on the official repository. In githost.log this error is printed at the same time as trying to compare the branches: November 26, 2014 11:24 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/repo/gitlab-satellites/company/project/.git --work-tree=/repo/gitlab-satellites/company/project branch -D rc error: Cannot delete the branch 'rc' which you are currently on. rc is branched from develop and regularly merged back into develop in the official repository. It seemed that gitlabs merge screen started working again once the developer had pushed rc and develop branches to his origin repository as well as the bugfix branch. But this doesn't seem to be 100% fix for the problem. Could anyone say if this a known issue or if there is a way to fix it. There is a stack overflow question http://stackoverflow.com/questions/25133398/can-not-do-merge-request-on-gitlab which seems relevant but isn't entirely clear. Cheers Ben -- 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/c78ed8df-3e3b-4b21-a6ca-5adaf806cf70%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
