Merge Trains Improvements (Fast-forward support) - Weekly Project Plan

Merge Trains - Weekly Project Plan

We have released fast-forward support for merge trains as well as some additional bug fixes while we were focused on merge train development. We will continue to work towards maturity level “Complete” for merge trains in future milestones. For now, I am closing this particular project plan as the particular feature has shipped.

Estimated Iteration Completion Milestones

• 16.4: Initial Beta Release of Fast Forward Merge Trains and Merge Immediately without Train Restart
• 16.5: GA Release of Fast Forward Merge Trains
• 16.6: Additional Bug Fixes

Week of September 11, 2023 (W37)

Team Capacity

• 2 Backend Engineers

Goals

• [~] Complete Feature flag rollout of fast forward support or merge trains.
• [~] Merge Issue (minor) for investigate concern that UI pipeline might not be created properly and/or status is delayed. This was raised during review of incomplete code. This might be fixed once all the parts are together)
• [~] Fast-follows for issues that arise during roll-out
• [~] Merge MR(s) for Add “Merge Immediately” option without interrupting merge train
• Merge MR for keeping track of fast-forward merge train SHAs
• Enable standard commit messages for merge trains by default and on GitLab.com
• Enable improved merge train ref creation by default and on GitLab.com
• Enable Feature flag and one for SM of creating train ref using rebase.

Milestone 16.5 (September 18, 2023 - October 16, 2023)

Week of September 18, 2023 (W38)

Team Capacity

• 2 Backend Engineers

Goals

• Merge MR(s) for Add “Merge Immediately” option without interrupting merge train
• [~] Rollout feature flag for Add “Merge Immediately” option without interrupting merge train
• Complete Feature flag rollout of fast forward support or merge trains.
• Merge Issue for updating queries that associate rebased fast-forward merges with related MRs

Week of September 25, 2023 (W39)

Team Capacity

• 2 Backend Engineers

Goals

• [~] Add developer documentation

Week of October 2, 2023 (W40)

Team Capacity

• 2 Backend Engineers

Goals

• [~] Merge MR for Merge request stuck in locked state when getting merged in a merge train
• Merge Issue (minor) for investigate concern that UI pipeline might not be created properly and/or status is delayed. This was raised during review of incomplete code. This might be fixed once all the parts are together)
• [~] Investigate and maybe merge Issue where commit verification gets lost on fast-forward merge trains
• Fast-follows for issues that arise during roll-out

Week of October 9, 2023 (W41)

Team Capacity

• 2 Backend Engineers

Goals

• [~] Complete bug fix - “Merge” button appears instead of “Start merge train” when manual jobs are not triggered.
• [~] Duplicate - Complete bug fix - Incorrect merge button appearing when waiting for manual action
• Fast-follows for issues that arise during roll-out

Week of October 16, 2023 (W42)

Team Capacity

• 1 Backend Engineers

Goals

• Any remaining fast-follows for issues that arise during roll-out
• [~] Complete bug fix - Merge train-enabled merge request fails with “Merge request is not mergeable”, succeeds on retry without changes

Milestone 16.6 (October 17, 2023 - November 10, 2023)

Team Capacity

• 1 Backend Engineer

Goals

• [~] Clean-up Feature flag for creating train ref using rebase.
• Clean-up Feature flag for fast forward support or merge trains.
• Clean-up feature flag for Add “Merge Immediately” option without interrupting merge train
• [~] Merge MR(s) for updating merge-result pipelines behind feature flag (breaking change)
• [~] Complete bug fix - MergeTrain API failing with error Branch has been updated since the merge was requested. Please review the changes. Try again.
• [~] Complete bug fix - Merge train-enabled merge request fails with “Merge request is not mergeable”, succeeds on retry without changes

View page source - Edit this page - please contribute.