From 7985c8f2f436ec964bc7b6b511c5dd09cb08492f Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 4 Aug 2021 10:51:03 -0700
Subject: [PATCH] build: rebase release branch before reverting bump

---
 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 d129207f3fef0..e849ca149f186 100755
--- a/script/release/release-artifact-cleanup.js
+++ b/script/release/release-artifact-cleanup.js
@@ -27,6 +27,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) {