diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index 6b50581bebba67a4b3e8f60a2f78e6d7540c8995..c3f69a4cb7e2fb5626399b51821233cca007ac95 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -135,7 +135,11 @@ async function processBranch(branchConfig) { if (mergeStatus === 'automerged') { logger.debug('Branch is automerged - returning'); return 'automerged'; - } else if (mergeStatus === 'failed') { + } else if ( + mergeStatus === 'automerge aborted - PR exists' || + mergeStatus === 'failed' + ) { + logger.info({ mergeStatus }, 'Branch automerge not possible'); config.forcePr = true; } } catch (err) {