Merge request with rebase option still performs merge when branch names match / Rebasing in GitLab 8.0
We're utilizing the option perform a rebase prior to merging on merge requests. We've run some tests and confirmed that, if the source and target branch names are the same, a traditional merge is performed.
Contrived example:
- We have two repos on our server:
foobar/foobarandusername/foobar - Both repos have a branch
my-branch - A merge request is created and approved. Source:
/username/foobar:my-branchTarget:/foobar/foobar:my-branch - Commit history shows a merge event, rather than a contiguous string of commits, per the rebase workflow, e.g. "Merge branch 'my-branch' into 'my-branch'"
This behavior occurs despite confirming that all the rebase options were enabled (globally and per merge request).
Edited by Sean Arnold