Rebase merge train refs in fast-forward or semi-linear train after a skip-merge
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Release Notes
Users can merge immediately if they are using fast-forward or semi-linear merge methods.
Problem to solve
When an immediate non-interrupting merge occurs to a project with a long-running merge train, the train ref starts to diverge from the target branch.
- When using fast-forward and semi-linear merge trains, the train ref can no longer be fast-forward merged into the target branch
Technical Proposal
-
When merging a car in a fast-forward or semi-linear train, if a skip-merge is detected in the history, rebase the train ref one more time prior to merge.
-
Remove limitation documentation and re-enable the UI. i.e. undo #429010 (closed)
This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.