Merge request into a branch of the same name as a tag fails
Summary
If you have a tag of the same name of a branch name and create a merge request to merge into the branch, actually pressing "Merge" on Gitlab interface produces error.
Steps to reproduce
- Create
qa
branch - Create
qa
tag against some commit - Create merge request from
master
toqa
- Once Gitlab gives access to Merge, attempt to merge
- Error message about conflicts displays
Example Project
(If possible, please create an example project here on GitLab.com that exhibits the problematic behavior, and link to it here in the bug report)
(If you are using an older version of GitLab, this will also determine whether the bug is fixed in a more recent version)
What is the current bug behavior?
- Error message about conflicts is displayed without much help
What is the expected correct behavior?
Either merges into the branch, or displays a more helpful error message that you probably shouldn't have a branch and a tag with the same name
Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's tough to read otherwise.)
Output of checks
(If you are reporting a bug on GitLab.com, write: This bug happens on GitLab.com)
Results of GitLab environment info
I don't have access to this right now
Expand for output related to GitLab environment info
(For installations with omnibus-gitlab package run and paste the output of:
sudo gitlab-rake gitlab:env:info
)(For installations from source run and paste the output of:
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
)
Results of GitLab application Check
I don't have access to this right now
Expand for output related to the GitLab application check
(For installations with omnibus-gitlab package run and paste the output of:
sudo gitlab-rake gitlab:check SANITIZE=true
)(For installations from source run and paste the output of:
sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true
)(we will only investigate if the tests are passing)
Possible fixes
(If you can, link to the line of code that might be responsible for the problem)