From 9f2e8d7833fa05100f6e9ec2b47c0c75c4d6c293 Mon Sep 17 00:00:00 2001 From: Malo Marrec Date: Wed, 23 Jun 2021 16:46:09 +0200 Subject: [PATCH] Add experimental badge to merge bulk action (#22318) --- doc/batch_changes/how-tos/bulk_operations_on_changesets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/batch_changes/how-tos/bulk_operations_on_changesets.md b/doc/batch_changes/how-tos/bulk_operations_on_changesets.md index fdb73fc9a176..f3c9d41bf1ce 100644 --- a/doc/batch_changes/how-tos/bulk_operations_on_changesets.md +++ b/doc/batch_changes/how-tos/bulk_operations_on_changesets.md @@ -23,7 +23,7 @@ Bulk operations allow a single action to be performed across many changesets in - Commenting: Post a comment on all selected changesets. This can be particularly useful for pinging people, reminding them to take a look at the changeset, or posting your favorite emoji 🦡. - Detach: Only available in the archived tab. Detach a selection of changesets from the batch change to remove them from the archived tab. - Re-enqueue: Only available if filtering by state `failed`. Re-enqueues the pending changes for all selected changesets that failed. -- Merge: Only available if filtering by state `open`. Tries to merge the selected changesets on the code hosts. Due to the nature of changesets, there are many states in which a changeset is not mergeable. This won't break the entire bulk operation, but single changesets may not be merged after the run for this reason. The bulk operations tab lists those where merging failed below the bulk operation in that case. In the confirmation modal, you can select to merge using the squash merge strategy. This is supported on both GitHub and GitLab, but not on Bitbucket Server. In this case, regular merges are always used for merging the changesets. +- Experimental Merge: Only available if filtering by state `open`. Tries to merge the selected changesets on the code hosts. Due to the nature of changesets, there are many states in which a changeset is not mergeable. This won't break the entire bulk operation, but single changesets may not be merged after the run for this reason. The bulk operations tab lists those where merging failed below the bulk operation in that case. In the confirmation modal, you can select to merge using the squash merge strategy. This is supported on both GitHub and GitLab, but not on Bitbucket Server. In this case, regular merges are always used for merging the changesets. _More types coming soon._