Add throw on not rebaseable to unmatched PRs, too

weswigham · weswigham · commit b3d55d0cd83d · 2019-06-26T16:01:51.000-07:00
diff --git 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}`]],

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,8 @@ async function main() {`
`51`	`51`	`issue_number: num,`
`52`	`52`	body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.`
`53`	`53`	`});`
`54`		- throw new Error(`Rebase conflict detected in PR ${num} with master`);
`55`	`54`	`}`
`56`		`- return; // A PR is currently in conflict, give up`
	`55`	+ throw new Error(`Rebase conflict detected in PR ${num} with master`); // A PR is currently in conflict, give up
`57`	`56`	`}`
`58`	`57`	`runSequence([`
`59`	`58`	["git", ["fetch", "origin", `pull/${num}/head:${num}`]],