From 23cf11a788397f6f812c637e548a3d2023384e27 Mon Sep 17 00:00:00 2001 From: Sonu Kapoor Date: Mon, 16 Dec 2019 13:04:18 -0500 Subject: [PATCH] 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 --- tools/rebase-pr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rebase-pr.js b/tools/rebase-pr.js index 19c66ec03c..c11e80547a 100644 --- a/tools/rebase-pr.js +++ b/tools/rebase-pr.js @@ -103,7 +103,7 @@ async function _main(repository, prNumber) { git fetch upstream ${target.baseRef}; git checkout ${target.headRef}; - git rebase origin/${target.baseRef}; + git rebase upstream/${target.baseRef}; git push --force-with-lease; `); } else {