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

merge -> rebase in experiment sync script text

Browse Source
This commit is contained in:
Wesley Wigham 2019-06-05 15:28:52 -07:00
parent bddcf10eb8
commit dcf2fa930d
No known key found for this signature in database
GPG Key ID: D59F87F60C5400C9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,9 @@ async function main() {
owner: "Microsoft",
repo: "TypeScript",
issue_number: num,
body: `This PR is configured as an experiment, and currently has merge conflicts with master - please rebase onto master and fix the conflicts.`
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(`Merge conflict detected in PR ${num} with master`);
throw new Error(`Rebase conflict detected in PR ${num} with master`);
}
return; // A PR is currently in conflict, give up
}