diff --git a/docs/usage/updating-rebasing.md b/docs/usage/updating-rebasing.md index 8528b1e61efd8aa4ed7745bc76e6cf2b7901df0d..6bfadb298f1c374e58ecf5100d72822ab02c7507 100644 --- a/docs/usage/updating-rebasing.md +++ b/docs/usage/updating-rebasing.md @@ -22,8 +22,13 @@ Instead, Renovate reapplies all updates into a new commit based off of the head ## No rebasing if you have made edits First of all, here is the one time when Renovate _won't_ update branches. -If you edit a Renovate branch directly (e.g. to make a code fix to allow tests to pass again) then Renovate stops all updates of that branch. -It is up to you to either finish the job and merge the PR, or rename it and close it so that Renovate can take back over again. +If you push a new commit to a Renovate branch, for example to fix your code so the tests pass, then Renovate stops all updates of that branch. +It is up to you to either finish the job and merge the PR, or rename it and close it so that Renovate can take over again. + +<!-- prettier-ignore --> +!!! warning + Do _not_ amend Renovate's commits, because Renovate will rebase over your amended commit. + Keep your work safe and always push your own _new_ commit to any Renovate branch. ## Rebasing conflicted PRs