From 89ace76ff11eebb7b0ab167df5b7b35f6b9629ae Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 14:41:05 +0200
Subject: [PATCH] workflows/bot: retry failed merges

By not keeping the node_id in the comments resulting from a failed
merge, these merges will be automatically retried.
---
 ci/github-script/merge.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index b08e2b4e2fdc..3c7576d659bb 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -230,6 +230,8 @@ async function handleMerge({
       try {
         body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
       } catch (e) {
+        // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
+        body.shift()
         body.push(`:x: Merge failed with: ${e} (#371492)`)
       }
     } else {