From 59ab79417d82d9900d24e686a0b23451d6612539 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 5 Aug 2021 10:49:12 -0700
Subject: [PATCH] build: rebase release branch before reverting bump (#30400)

---
 script/release/release-artifact-cleanup.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/release/release-artifact-cleanup.js b/script/release/release-artifact-cleanup.js
index 1c4d70e9352c..080b078f4928 100755
--- a/script/release/release-artifact-cleanup.js
+++ b/script/release/release-artifact-cleanup.js
@@ -26,6 +26,7 @@ function getLastBumpCommit (tag) {
 async function revertBumpCommit (tag) {
   const branch = await getCurrentBranch();
   const commitToRevert = getLastBumpCommit(tag).hash;
+  await GitProcess.exec(['pull', '--rebase']);
   await GitProcess.exec(['revert', commitToRevert], ELECTRON_DIR);
   const pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], ELECTRON_DIR);
   if (pushDetails.exitCode === 0) {