From b3d55d0cd83dfc5dd9b34c9fddba39ac9d58ea45 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Wed, 26 Jun 2019 16:01:51 -0700
Subject: [PATCH] Add throw on not rebaseable to unmatched PRs, too

---
 scripts/update-experimental-branches.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js
index 92567b9c89b..8b1d1b0f54f 100644
--- a/scripts/update-experimental-branches.js
+++ b/scripts/update-experimental-branches.js
@@ -51,9 +51,8 @@ async function main() {
                         issue_number: num,
                         body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.`
                     });
-                    throw new Error(`Rebase conflict detected in PR ${num} with master`);
                 }
-                return; // A PR is currently in conflict, give up
+                throw new Error(`Rebase conflict detected in PR ${num} with master`); // A PR is currently in conflict, give up
             }
             runSequence([
                 ["git", ["fetch", "origin", `pull/${num}/head:${num}`]],