renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 15:06:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: pr should be ensured if branch automerge previously failed

Browse source 
If branch automerge *previously* failed, then still make sure we are keeping the PR up to date.

Closes #1336
This commit is contained in:
Rhys Arkins 2017-12-28 17:19:59 +01:00
parent 1a3b0b61ea
commit 97fc3e6135
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/workers/branch/index.js
View file

@ -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) {