Commit 71f11b5b authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'docs-nfriend-update-merge-train-merge-immediately-docs' into 'master'

Add documentation for new "merge immediately" workflow for merge trains

See merge request gitlab-org/gitlab!21060
parents 8ef52591 0c5d8b7f
......@@ -86,12 +86,15 @@ In case, you have a high-priority merge request (e.g. critical patch) to be merg
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.
![Merge Immediately](img/merge_train_immediate_merge.png)
![Merge Immediately](img/merge_train_immediate_merge_v12_6.png)
However, every time you merge a merge request immediately, it could affect the
existing merge train to be reconstructed, specifically, it regenerates expected
merge commits and pipelines. This means, merging immediately essentially wastes
CI resources.
CI resources. Because of these downsides, you will be asked to confirm before
the merge is initiated:
![Merge immediately confirmation dialog](img/merge_train_immediate_merge_confirmation_dialog_v12_6.png)
## Troubleshooting
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment