diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-24 21:10:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-24 21:10:53 +0300 |
| commit | e9322e019bfeb7f33ce4c17662d93e6579303c2b (patch) | |
| tree | 0c1dd4ac4e8f60164f7e21ba33bf0b1ee867c347 /doc/user | |
| parent | 234dc40a12a1cdaef0cdb825ca4acc3f271c6394 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/fast_forward_merge.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md index b1e8d761f5c..7edc379399b 100644 --- a/doc/user/project/merge_requests/fast_forward_merge.md +++ b/doc/user/project/merge_requests/fast_forward_merge.md @@ -24,9 +24,11 @@ When a fast-forward merge is not possible, the user is given the option to rebas ## Enabling fast-forward merges -1. Navigate to your project's **Settings** and search for the 'Merge method' -1. Select the **Fast-forward merge** option -1. Hit **Save changes** for the changes to take effect +1. On the top bar, select **Menu > Projects** and find your project. +1. On the left sidebar, select **Settings > General**. +1. Expand **Merge requests**. +1. In the **Merge method** section, select **Fast-forward merge**. +1. Select **Save changes**. Now, when you visit the merge request page, you can accept it **only if a fast-forward merge is possible**. |