Merge Requests Merged with Failure & Close Status
Summary
A failed merge through merge request will commit changes to the target branch with indication it failed and merge closed. Although the merge request reports failure and is closed, the changes are still merged without a merge commit, simply a normal commit as if committed directly as reported in the pipeline and in the git history. The end result is that the changes are in fact merged, however the merge request indicates the changes were not and that the merge request was simply closed.
In the overview of the merge request the last two points show:
- User 1 merged 5:01pm
- User 2 closed 5:01pm
Steps to reproduce
-
Select the option to delete your branch when merging.
-
Click merge on the merge request at the same time as someone else does and the merge will fail with an error saying to try again.
What is the current bug behavior?
Merge request indicates failure, branch is deleted and merge request closed. Pipeline indicates a successful commit to the target branch.
What is the expected correct behavior?
Merge request indicates the changes were merged successfully and adds a merge commit to the target branch and indicates the merge request was merged NOT closed.
Relevant logs and/or screenshots
Error message within the now closed merge request:
The changes were not merged into branch_name
Merge failed: Something went wrong during merge: 9:Could not update branch_name. Please refresh and try again.. Please try again.
Deletes source branch ?
Results of GitLab environment info
GitLab Enterprise Edition 13.5.4-ee