Ensure synced with upstream/master

nodejs · May 5, 2020 · 8ce4bd6 · 8ce4bd6
1 parent 2bc07df
commit 8ce4bd6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/promote_release.js b/lib/promote_release.js
@@ -323,6 +323,9 @@ class ReleasePromotion {
     const releaseCommitSha = this.getCommitSha(1);
     runSync('git', ['checkout', 'master']);
 
+    // Pull master from upstream, in case it's not up-to-date.
+    runSync('git', ['pull', '--rebase', 'upstream', 'master']);
+
     // There will be conflicts.
     runSync('git', ['cherry-pick', releaseCommitSha]);
   }