Project settings: fix semi-linear merge description
What does this MR do and why?
This MR attempts to clarify description of Merge commit with semi-linear history merge method.
On the "before" screenshot below, methods Merge commit with semi-linear history and Fast-forward merge have almost the same description. A bit confusingly, semi-linear history is described as Fast-forward merges only. It doesn't sound right to me, since merge commits are always created by that method.
On the "very old" screenshot below, you can also see that even though the descriptions were much more disorganized back then, they were a bit more accurate. I think this change slipped through in !10491 (merged), but I can't find there any discussion on this wording.
I've noticed that this description being re-used in designs for reorganized merge methods, so I've thought it might be a good idea to revisit it.
Screenshots or screen recordings
AFTER:
BEFORE:
Click to show before:
I found a very old screen to compare:
Click to show very old screen:
How to set up and validate locally
- Go to project that you have at least maintainer role in.
- Go to Settings -> General.
- Expand "Merge requests" section.
- Check "Merge method" description (semi-linear option).
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.