Multiple merge request targets
In our workflow for gitlab-ce~2779335 issues, we currently create 4 (assuming single codebase) merge requests: 1 to master, and 3 to the latest *-stable branches.
The review process takes place on the merge request targeting master, after the MR is approved the other merge requests are created and finally assigned to the bot that will merge all of the merge requests.
This can sometimes cause issues: https://gitlab.com/gitlab-org/release/framework/issues/442.
I think we could make this process easier if we only had to create one merge request and specify multiple branches it needs to be merged into:
The diffs being shown are the ones to the "main target branch": master
We show a widget showing the mergeability with the other target branches.
-
Conflicts or not: When there are conflicts, we'll need to create a separate merge request that we'll merge first, that way the target is fulfilled as there are no more changes.
-
Run a pipelines on the merge commit to see if there are spec failures.
The merge request is only mergeable if the merge can take place on all targets and GitLab takes care not to perform the merge if one of the the targets fails.