Project 'gitlab-org/gitlab-ce' was moved to 'gitlab-org/gitlab-foss'. Please update any links and bookmarks that may still have the old path.
"Merge commit with semi-linear history" allows to merge non fast-forward merge
Summary
Merge commit with semi-linear history
allows to merge non fast-forward merge.
Steps to reproduce
Here is what we done:
- My colleague create a MR 1
- I create a MR 2
- I commit/push some code to MR 2
- My colleague commit/push some code to MR 1
- I merge MR 2
- I commit/push some code directly on main branch
- My college is able to merge MR 1 without rebase
What is the current bug behavior?
My colleague was able to merge a non FF merge.
What is the expected correct behavior?
My colleague should have been blocked when merge until he rebase its MR.
Relevant logs and/or screenshots
Others infos
This happened on GitLab Community Edition 10.1.0