diff options
Diffstat (limited to 'doc/ci/pipelines/merge_trains.md')
| -rw-r--r-- | doc/ci/pipelines/merge_trains.md | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/ci/pipelines/merge_trains.md b/doc/ci/pipelines/merge_trains.md index a54087262e7..45d9e548d6a 100644 --- a/doc/ci/pipelines/merge_trains.md +++ b/doc/ci/pipelines/merge_trains.md @@ -1,7 +1,7 @@ --- stage: Verify group: Pipeline Execution -info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments +info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments --- # Merge trains **(PREMIUM ALL)** @@ -162,13 +162,15 @@ When you remove a merge request from a merge train: ## Skip the merge train and merge immediately If you have a high-priority merge request, like a critical patch that must -be merged urgently, select **Merge Immediately**. +be merged urgently, you can select **Merge Immediately**. When you merge a merge request immediately: -- The current merge train is recreated. -- All pipelines restart. -- Redundant pipelines [are cancelled](#automatic-pipeline-cancellation). +- The commits from the merge request are merged, ignoring the status of the merge train. +- The merge train pipelines for all other merge requests on the train [are cancelled](#automatic-pipeline-cancellation). +- A new merge train starts and all the merge requests from the original merge train are added to this new merge train, + with a new merge train pipeline for each. These new merge train pipelines now contain + the commits added by the merge request that was merged immediately. WARNING: Merging immediately can use a lot of CI/CD resources. Use this option |