Skip to content

Automatically rebase dependent merge requests when merge target is rebased

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

Problem to Solve

In #323329 (closed) we implemented automatic rebasing when a merge request is automatically retargeted. In a small chain (1-2) MRs this works quite well to improve the experience of the second MR in the chain. However, if you have MRs like main <- A <- B <- C then when A is merged, B will be rebased, but C won't leaving it in a confusing state.

Proposal

We should automatically rebase all of the MRs in a chain when the MRs in front of them are rebased. This keeps the diffs of the relevant MRs correct and makes it easier to continue progressing those MRs.

Additional Details

Some kind of limit/logic needs to be established for this so that we're not rebasing an infinite number of MRs for this action.

Edited by 🤖 GitLab Bot 🤖