Skip to content

Commit

Permalink
docs: push new commit instead of amending Renovate's commit (#23833)
Browse files Browse the repository at this point in the history
  • Loading branch information
HonkingGoose committed Aug 12, 2023
1 parent 01ed277 commit 5c4b440
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions docs/usage/updating-rebasing.md
Expand Up @@ -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

Expand Down

0 comments on commit 5c4b440

Please sign in to comment.