From 74dec2c1aa7f651daa56ab045976fe3eea4e32f5 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Wed, 19 Feb 2025 10:14:32 -0700 Subject: [PATCH 1/2] Update rebase options documentation --- doc/user/project/merge_requests/conflicts.md | 11 +++++++++-- doc/user/project/merge_requests/methods/_index.md | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md index 5da14110793d09..92b44981bf2828 100644 --- a/doc/user/project/merge_requests/conflicts.md +++ b/doc/user/project/merge_requests/conflicts.md @@ -111,14 +111,15 @@ The merge conflict resolution editor helps you resolve these conflicts in GitLab If your merge request is stuck with a `Checking ability to merge automatically` message, you can: +- Use the **Rebase source branch** button in the merge widget. - Use the `/rebase` [quick action](../quick_actions.md#issues-merge-requests-and-epics) in the GitLab UI. - [Rebase with Git](../../../topics/git/git_rebase.md#rebase). To troubleshoot CI/CD pipeline issues, see [Debugging CI/CD pipelines](../../../ci/debugging.md). -### Rebase with a quick action +### Rebase in the GitLab UI -You can rebase a merge request from the GitLab UI with the `/rebase` [quick action](../quick_actions.md). +You can rebase a merge request from the GitLab UI with either the **Rebase source branch** button or the `/rebase` [quick action](../quick_actions.md). Prerequisites: @@ -127,6 +128,12 @@ Prerequisites: - If the merge request is in a fork, the fork must allow commits [from members of the upstream project](allow_collaboration.md). +To rebase with the button: + +1. Go to your merge request. +1. Find the merge widget. +1. Select **Rebase source branch**. + To rebase with the quick action: 1. Go to your merge request. diff --git a/doc/user/project/merge_requests/methods/_index.md b/doc/user/project/merge_requests/methods/_index.md index ed644ee10b48a6..be95f4cb6b0841 100644 --- a/doc/user/project/merge_requests/methods/_index.md +++ b/doc/user/project/merge_requests/methods/_index.md @@ -205,7 +205,7 @@ In these merge methods, you can merge only when your source branch is up-to-date If a fast-forward merge is not possible but a conflict-free rebase is possible, GitLab provides: -- The [`/rebase` quick action](../conflicts.md#rebase-with-a-quick-action). +- The [`/rebase` quick action](../conflicts.md#rebase-in-the-gitlab-ui). - The option to select **Rebase** in the user interface. You must rebase the source branch locally before a fast-forward merge if both -- GitLab From bfed5af653597b0c4b6e1251216f2560a4570d91 Mon Sep 17 00:00:00 2001 From: Amy Qualls Date: Wed, 19 Feb 2025 12:01:49 -0800 Subject: [PATCH 2/2] Revisions for tone and style A little bit of polish to work around some words we really shouldn't use. --- doc/user/project/merge_requests/conflicts.md | 26 +++++++++---------- .../project/merge_requests/methods/_index.md | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md index 92b44981bf2828..7d1110cd6b5738 100644 --- a/doc/user/project/merge_requests/conflicts.md +++ b/doc/user/project/merge_requests/conflicts.md @@ -111,15 +111,16 @@ The merge conflict resolution editor helps you resolve these conflicts in GitLab If your merge request is stuck with a `Checking ability to merge automatically` message, you can: -- Use the **Rebase source branch** button in the merge widget. -- Use the `/rebase` [quick action](../quick_actions.md#issues-merge-requests-and-epics) in the GitLab UI. +- In a comment in the merge request, run the `/rebase` [quick action](../quick_actions.md#issues-merge-requests-and-epics). +- In the merge widget, select **Rebase source branch**. - [Rebase with Git](../../../topics/git/git_rebase.md#rebase). To troubleshoot CI/CD pipeline issues, see [Debugging CI/CD pipelines](../../../ci/debugging.md). ### Rebase in the GitLab UI -You can rebase a merge request from the GitLab UI with either the **Rebase source branch** button or the `/rebase` [quick action](../quick_actions.md). +To trigger a rebase from the GitLab UI, use the `/rebase` [quick action](../quick_actions.md), or the +rebase option in the merge request widget. Prerequisites: @@ -128,19 +129,16 @@ Prerequisites: - If the merge request is in a fork, the fork must allow commits [from members of the upstream project](allow_collaboration.md). -To rebase with the button: +To rebase a merge request's branch from the GitLab UI: -1. Go to your merge request. -1. Find the merge widget. -1. Select **Rebase source branch**. - -To rebase with the quick action: - -1. Go to your merge request. -1. Type `/rebase` in a comment. -1. Select **Comment**. +1. On the left sidebar, select **Search or go to** and find your project. +1. Select **Code > Merge requests** and find the merge request. +1. Either: + - On the **Overview** tab, scroll to the merge request widget and select **Rebase source branch**. + - In a comment, enter `/rebase` and select **Comment**. -GitLab schedules and executes a rebase of the branch against the default branch. +GitLab schedules, then runs, a rebase of the branch against the default branch. +GitLab shows the completed rebase as a system note. ## Related topics diff --git a/doc/user/project/merge_requests/methods/_index.md b/doc/user/project/merge_requests/methods/_index.md index be95f4cb6b0841..1cb0426f04a875 100644 --- a/doc/user/project/merge_requests/methods/_index.md +++ b/doc/user/project/merge_requests/methods/_index.md @@ -205,7 +205,7 @@ In these merge methods, you can merge only when your source branch is up-to-date If a fast-forward merge is not possible but a conflict-free rebase is possible, GitLab provides: -- The [`/rebase` quick action](../conflicts.md#rebase-in-the-gitlab-ui). +- The [`/rebase` quick action](../conflicts.md#rebase). - The option to select **Rebase** in the user interface. You must rebase the source branch locally before a fast-forward merge if both -- GitLab