Fix incorrect wording about merge requests - REBASING IS NOT NEEDED
New to GitLab and one thing has been maddening.. and it doesn't need to be!
In a Merge Request, if the source branch is behind the target branch, GitLab incorrectly states:
Merge blocked: the source branch must be rebased onto the target branch., and offers to do so (horrible, IMO.. rebasing is so hard in shared development).
However, this is not the case.
If the target branch is merged in to the source branch, GitLab will happily ffmerge the changes creating a single new commit on the target branch. This is what, afaict, people have been asking for for ages.
While all the other solutions may be great, the fact of the matter is that the UI in gitlab is making things worse.
One solution is changing the text to:
Merge blocked: the source branch is behind the target, either merge the target in to the source, or rebase the source to continue.
That sentence could cleaned up by using the branch names..
Merge blocked: the source branch is behind the target, either merge target_branch_name
in to source_branch_name
, or rebase to continue.
See also this comment, regarding the use of actual names or references to branches, as it will matter in the unification of such. #368295 (comment 1034516958)
Related issues:
- This is the actual solution I was hoping for when #360020 (closed) was created on my behalf.
- I feel like this would solve #355613 (except that the source still needs to be merged in, which may slow things down as actions would probably need to run again before the actual merge happens).
- Knowing that all it takes for the behavior requested in #1822 is for the source to be merged in would help a lot of people.
- Merging the target in to the source would help here too #364088 (closed)
- Maybe #360671 (closed) would happen less since the need to rebase isn't real.
- The list goes on.