Skip to content

Resolve "Create rebased ref and fast-forward to merge"

Marc Shawrequested to merge
519381-create-rebased-ref-and-fast-forward-to-merge into master

What does this MR do and why?

When either, fast forward, or merge with semi linear history, merge strategy is selected, previously we required the user rebase the merge request in order for us to merge. With this change, we will automatically rebase the merge request.

How to test

  • Select semi linear history strategy
  • Create an MR
  • Make a change in master
  • See that the rebase is required in the merge request
  • Turn on the feature flag rebase_on_merge_automatic
  • Reload the page, and see that we can now merge
  • Click merge, and it should merge as expected
  • Confirm that the merge commit is created, with the source branch being merged into the target

Related to #519381 (closed)

Edited by Marc Shaw

Merge request reports