microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-12-11 17:41:26 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Add throw on not rebaseable to unmatched PRs, too

Browse Source
This commit is contained in:
Wesley Wigham 2019-06-26 16:01:51 -07:00
parent 1479bb6bc8
commit b3d55d0cd8
No known key found for this signature in database
GPG Key ID: D59F87F60C5400C9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/update-experimental-branches.js
View File

@ -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}`]],