From 6dded23274901abb2e013129febc195b81adbb2e Mon Sep 17 00:00:00 2001 From: Eric Wieser Date: Mon, 7 Nov 2022 20:25:05 +0000 Subject: [PATCH] ci(bors): set update_base_for_deletes (#17410) From the source, this doesn't do anything to the git history, but does prevent chained PRs being closed after bors closes the first one. This still doesn't work very well for us, but it's better than randomly closing PRs that haven't been merged. --- bors.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/bors.toml b/bors.toml index 35731eca652b4..2291ce6fe6256 100644 --- a/bors.toml +++ b/bors.toml @@ -6,4 +6,5 @@ use_squash_merge = true timeout_sec = 28800 block_labels = ["not-ready-to-merge", "WIP", "blocked-by-other-PR", "merge-conflict", "awaiting-CI"] delete_merged_branches = true +update_base_for_deletes = true cut_body_after = "---"