diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
commit | c72e5ebe9938d315ec598197873e71a80168d40a (patch) | |
tree | 439bf5c40aaf774e5a301825af517cb52726f450 /doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains | |
parent | ffc43b862df32a590eae874bcbb11109b46dc8be (diff) | |
download | gitlab-ce-c72e5ebe9938d315ec598197873e71a80168d40a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains')
-rw-r--r-- | doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md index 744713b0678..e5949473d01 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md @@ -21,7 +21,7 @@ just as it works in the current state. However, instead of queuing and waiting, each item takes the completed state of the previous (pending) merge ref, adds its own changes, and starts the pipeline immediately in parallel under the assumption that everything is going to pass. -In this way, if all the pipelines in the train merge successfully, no pipeline time is wasted either queuing or retrying. +This means that if all the pipelines in the train merge successfully, no pipeline time is wasted either queuing or retrying. If the button is subsequently pressed in a different MR, instead of creating a new pipeline for the target branch, it creates a new pipeline targeting the merge result of the previous MR plus the target branch. Pipelines invalidated through failures are immediately canceled and requeued. @@ -83,7 +83,7 @@ button while the latest pipeline is running. ## Immediately merge a merge request with a merge train -In case, you have a high-priority merge request (e.g. critical patch) to be merged urgently, +In the case where you have a high-priority merge request (for example, a critical patch) to be merged urgently, you can use **Merge Immediately** option for bypassing the merge train. This is the fastest option to get the change merged into the target branch. |