From 8445c4259023b9fbbd76bf7c184f5d56202cfc95 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Fri, 7 May 2021 21:23:46 +0200 Subject: [PATCH] fix(github): don't block forkToken automerge (#9909) --- lib/platform/github/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts index 3d1e932740..a799bad902 100644 --- a/lib/platform/github/index.ts +++ b/lib/platform/github/index.ts @@ -634,6 +634,10 @@ async function getOpenPrs(): Promise { pr.canMergeReason = `hasNegativeReview`; } else if (canMergeStates.includes(pr.mergeStateStatus)) { pr.canMerge = true; + } else if (config.forkToken && pr.mergeStateStatus === 'BLOCKED') { + // The main token can't merge but maybe the forking token can + // istanbul ignore next + pr.canMerge = true; } else { pr.canMerge = false; pr.canMergeReason = `mergeStateStatus = ${pr.mergeStateStatus}`;