diff --git a/lib/workers/branch/automerge.ts b/lib/workers/branch/automerge.ts index 8ae312e8ffd7b49d5db3e093488e49f424cb57f0..fd4f82b3508db8cf250d0d029c8cce32ee11bbab 100644 --- a/lib/workers/branch/automerge.ts +++ b/lib/workers/branch/automerge.ts @@ -47,9 +47,13 @@ export async function tryBranchAutomerge( } if ( err.message.includes('refusing to merge unrelated histories') || - err.message.includes('Not possible to fast-forward') + err.message.includes('Not possible to fast-forward') || + err.message.includes( + 'Updates were rejected because the tip of your current branch is behind' + ) ) { - logger.warn({ err }, 'Branch is not up to date - cannot automerge'); + logger.debug({ err }, 'Branch automerge error'); + logger.info('Branch is not up to date - cannot automerge'); return 'stale'; } if (err.message.includes('Protected branch')) {