fix: try to merge the upstream repo branch on the fork

googleapis · Feb 22, 2022 · a9708d9 · a9708d9
1 parent 1f3edc4
commit a9708d9
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -130,6 +130,18 @@ async function createPullRequest(
   };
   const origin: RepoDomain =
     options.fork === false ? upstream : await fork(octokit, upstream);
+  if (options.fork) {
+    // try to sync the fork
+    await retry(
+      async () => {
+        await octokit.repos.mergeUpstream({
+          owner: upstream.owner,
+          repo: upstream.repo,
+          branch: gitHubConfigs.primary,
+        })
+      }
+    );
+  }
   const originBranch: BranchDomain = {
     ...origin,
     branch: gitHubConfigs.branch,