Merge pull request #46 from ipfs/conflict

fix: catch error if there or conflicts on branch update
ipfs · Aug 31, 2022 · a0ff678 · a0ff678
2 parents 8670a17 + ebb4ffa
commit a0ff678
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/scripts/src/actions/update-pull-requests.ts b/scripts/src/actions/update-pull-requests.ts
@@ -31,10 +31,15 @@ async function updatePullRequests() {
       continue
     }
 
-    github.client.pulls.updateBranch({
-      ...context.repo,
-      pull_number: pull.number
-    })
+    try {
+      github.client.pulls.updateBranch({
+        ...context.repo,
+        pull_number: pull.number
+      })
+    } catch (error) {
+      // we might be unable to update the pull request if it there is a conflict
+      console.error(error)
+    }
   }
 }