Skip to content

Automatically rebase MR when target branch is automatically retargeted

What does this MR do and why?

When we automatically retarget chained merge request's, it can lead to incorrect diffs that take into account the targeted branch, and it self. We can avoid this by rebasing at the same time as retargeting to ensure the merge request has the latest diff.

To Test:

  • Create a MR targetting main
  • Create another MR targetting the above
  • Merge the MR targetting main
  • Ensure that the other MR targets main, and was rebased

Screenshot 2024-01-12 at 10.29.51.png

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

Related to #323329 (closed)

Edited by Marc Shaw

Merge request reports