Skip to content
代码片段 群组 项目
提交 2e3acf6e 编辑于 作者: Marcel Amirault's avatar Marcel Amirault 提交者: Allison Browne
浏览文件

Clarify how merge trains work with merge immediately

上级 b4e60aed
No related branches found
No related tags found
无相关合并请求
...@@ -162,13 +162,15 @@ When you remove a merge request from a merge train: ...@@ -162,13 +162,15 @@ When you remove a merge request from a merge train:
## Skip the merge train and merge immediately ## Skip the merge train and merge immediately
If you have a high-priority merge request, like a critical patch that must 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: When you merge a merge request immediately:
- The current merge train is recreated. - The commits from the merge request are merged, ignoring the status of the merge train.
- All pipelines restart. - The merge train pipelines for all other merge requests on the train [are cancelled](#automatic-pipeline-cancellation).
- Redundant pipelines [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: WARNING:
Merging immediately can use a lot of CI/CD resources. Use this option Merging immediately can use a lot of CI/CD resources. Use this option
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册