## Problem Currently the <abbr title="merge request">MR</abbr>s merge widget shows different messages that communicate the “mergeability” of the MR, what's blocking the MR, and what the user can/should do. The problem is that those messages are not all concise, clear, and consistent between them. 1. **Inconsistent structure**: For example, when all threads must be resolved and there's an unresolved thread, we say `Before this can be merged, one or more threads must be resolved.` A different structure is then used when required approvals are missing: `You can only merge once this merge request is approved.` 1. **Different MR verbiage**: Sometimes we say `merge this request`, other times we say `merge this merge request`, or just `merge this`. 1. **Different pronouns**: Sometimes direct the message by using `you`, other times we don't. Note that even when `you` is used, the user seeing that message may not actually be able to do anything. For example, even if the user can't merge they can sometimes see this message: `You can only merge once the items above are resolved.` 1. **Lack of humanity**: Even when it's time to celebrate, because the MR is ready to be merged, is merging, or has been merged, we display robotic messages. Can we make our humanity shine through a bit? Related to the Lovable merge button epic: https://gitlab.com/groups/gitlab-org/-/epics/1381 ## Resources To see when and how each messages is shown in the merge widget, see the [states mapping](https://gitlab.com/gitlab-org/gitlab/-/issues/299193#mapping) and [screenshots](https://gitlab.com/gitlab-org/gitlab/-/issues/299193#screenshots). ## Proposed changes - **Previous:** `Before this can be merged, one or more threads must be resolved.` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/issues/289827 - **New message:** `X threads must be resolved` - **Current:** `Ready to be merged automatically. Ask someone with write access to this repository to merge this request` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/issues/336804 - **Previous:** `Fork project merge requests do not create merge request pipelines that validate a post merge result unless invoked by a project member.` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/issues/208300, https://gitlab.com/gitlab-org/gitlab/-/issues/283901, https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59036 - **Current:** If the last pipeline ran in the fork project, it may be inaccurate. Before merge, we advise running a pipeline in this project. ## Completed updates - **Previous:** `Fast-forward merge is not possible. Rebase the source branch onto {target branch name} to allow this merge request to be merged.` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/issues/336804, https://gitlab.com/gitlab-org/gitlab/-/issues/27077, https://gitlab.com/gitlab-org/gitlab/-/issues/327271, https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59422 - **New message 1:** Merge blocked: the source branch must be rebased onto the target branch. - **New message 2:** Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally. - **Previous:** `This merge request is in the process of being merged` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59693 - **Current:** `Merging, drum roll please…` (and others to add a rotation!) - **Previous:** `Allows commits from members who can merge to the target branch` - Issues and MRs: - **Current:** `The fork project allows commits from members who can write to the target branch. [More information](https://docs.gitlab.com/ee/user/project/merge_requests/allow_collaboration.html#enabling-commit-edits-from-upstream-members)` - **Previous:** `Pipeline blocked. The pipeline for this merge request requires a manual action to proceed.` - Issues and MRs: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59691 - **Current:** Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.