Skip to content

Respect rebase and squash settings when creating merge train ref

Hordur Freyr Yngvason requested to merge enable-ff-merge-trains-create-ref-service-by-default into master

What does this MR do and why?

This enables the feature flag merge_trains_create_ref_service by default. With the flag enabled, the merge train ref gets built according to the merge request's squash setting, and the project's preferred merge method. This means an automatic squash and rebase is performed as needed (without modifying the source branch).

This sets the foundation for fast-forward and semi-linear merge trains, in that the train ref gets properly prepared.

Rollout issue: #422724 (closed)

Changelog: changed

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.

Edited by Hordur Freyr Yngvason

Merge request reports