honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: fix remote name in rebase instructions (#34432) 

Previously, the rebase instructions were asking the user to rebase from
`origin/master` instead of `upstream/master`.

PR Close #34432
This commit is contained in:
Sonu Kapoor 2019-12-16 13:04:18 -05:00 committed by Kara Erickson
parent d0a04bf309
commit 23cf11a788
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/rebase-pr.js
View File

@ -103,7 +103,7 @@ async function _main(repository, prNumber) {
git fetch upstream ${target.baseRef}; git fetch upstream ${target.baseRef};
git checkout ${target.headRef}; git checkout ${target.headRef};
git rebase origin/${target.baseRef}; git rebase upstream/${target.baseRef};
git push --force-with-lease; git push --force-with-lease;
`); `);
} else { } else {