Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: HonkingGoose <[email protected]>
  • Loading branch information
rarkins and HonkingGoose authored Nov 4, 2021
1 parent 800be4d commit c846daf
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -1679,8 +1679,10 @@ It falls back to Renovate-based automerge if the platform-native automerge is no

You can also fine-tune the behavior by setting `packageRules` if you want to use it selectively (e.g. per-package).

If you rely on Renovate's behavior of rebasing automerging branches when `rebaseWhen=auto`, then note that you are no longer guaranteed of up-to-date branches when automerging if you enable platform automerge.
For example, GitHub might automerge a Renovate branch even if it is one or more commits behind the base branch at the time.
Note that the outcome of `rebaseWhen=auto` can differ when `platformAutomerge=true` is enable.
Normally when you set `rebaseWhen=auto` Renovate rebases any branch that's behind the base branch automatically, and some people rely on that.
This behavior is no longer guaranteed when you enable `platformAutomerge` because the platform might automerge a branch which is not up-to-date.
For example, GitHub might automerge a Renovate branch even if it's behind the base branch at the time.

## postUpdateOptions

Expand Down

0 comments on commit c846daf

Please sign in to comment.