From 5c4b440efc73b332741c3aeebcd0604fdf02f2ed Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Sat, 12 Aug 2023 07:32:48 +0200 Subject: [PATCH] docs: push new commit instead of amending Renovate's commit (#23833) --- docs/usage/updating-rebasing.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/usage/updating-rebasing.md b/docs/usage/updating-rebasing.md index 8528b1e61e..6bfadb298f 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 -- GitLab