From df14edd27a1de0749e2365677a5fb42893bd5ab4 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 19 Nov 2021 10:44:27 +0100
Subject: [PATCH] fix(automerge): catch branch automerge behind message
---
lib/workers/branch/automerge.ts | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/workers/branch/automerge.ts b/lib/workers/branch/automerge.ts
index 8ae312e8ff..fd4f82b350 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')) {
--
GitLab