Skip to content

Commit

Permalink
docs: rebaseWhen=conflicted + automerge (#9031)
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Mar 8, 2021
1 parent c8fc8ec commit dda7514
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,10 @@ Possible values and meanings:
- `conflicted`: Renovate will rebase only if the branch is conflicted
- `behind-base-branch`: Renovate will rebase whenever the branch falls 1 or more commit behind its base branch

Note: this field replaces the previous fields of `rebaseConflictedPrs` and `rebaseStalePrs`.
`rebaseWhen=conflicted` is not recommended if you have enabled Renovate automerge, because:

- It could result in a broken base branch if two updates are merged one after another without testing the new versions together
- If you have enforced that PRs must be up-to-date before merging (e.g. using branch protection on GitHub), then automerge won't be possible as soon as a PR gets out-of-date but remains non-conflicted

## recreateClosed

Expand Down

0 comments on commit dda7514

Please sign in to comment.