Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-20 00:08:49 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-20 00:08:49 +0300
commit1cd61065a0d86b492be5086906429ac5956e3672 (patch)
treebab228469be487451d64eec4a55820501007c8b4 /doc/user/project/merge_requests/index.md
parentd1be3e6f776e1c77976537548c1daa9af2fb2650 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests/index.md')
-rw-r--r--doc/user/project/merge_requests/index.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index dece5600b0d..345d937ed8c 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -229,6 +229,7 @@ An administrator can make this option the default in the project's settings.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10.
+> - Chained merge requests [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/323329) to automatically rebase on the new target branch in GitLab 16.9.
Merge requests are often chained together, with one merge request depending on
the code added or changed in another merge request. To support keeping individual
@@ -240,7 +241,7 @@ target branch merges into `main`. For example:
If these merge requests are open at the same time, and merge request 1 (`feature-alpha`)
merges into `main`, GitLab updates the destination of merge request 2 from `feature-alpha`
-to `main`.
+to `main` and then rebases the source branch onto the new target branch.
Merge requests with interconnected content updates are usually handled in one of these ways: