Skip to content
Snippets Groups Projects
Commit df14edd2 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

fix(automerge): catch branch automerge behind message

parent 2ae52b3b
No related branches found
Tags 37.439.0
No related merge requests found
......@@ -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')) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment