Skip to content

Draft: Use new merge train ref path for mergable refs

Hordur Freyr Yngvason requested to merge change-merge-train-ref-path into master

What does this MR do and why?

In order for it to be safe to fast-forward merge directly from the merge train ref, the ref needs to look exactly like the target branch would on merge. This was not always the case: Old merge trains did not respect most merge preferences, such as the commit message, squashing, and the project's merge method. Thus, it was possible for train refs to include commit messages that should not be merged.

To solve this problem, we introduce a new train ref that is always safe to merge when present. When it is not present, we fall back to the previous merge strategy.

See #421588 (closed)

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.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Merge request reports