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 {