Renovate keeps rebasing over my custom changes #18804
Labels
status:requirements
Full requirements are not yet known, so implementation should not be started
type:bug
Bug fix of existing functionality
How are you running Renovate?
Mend Renovate hosted app on github.com
If you're self-hosting Renovate, tell us what version of Renovate you run.
No response
If you're self-hosting Renovate, select which platform you are using.
No response
If you're self-hosting Renovate, tell us what version of the platform you run.
No response
Was this something which used to work for you, and then stopped?
I never saw this working
Describe the bug
Due to #12891 I need to manually fix a fair chunk of the renovate PRs that come in. My workflow for doing so is:
Sometimes when I do that Renovate correctly marks the branch as modified, and stops pushing to it. But often it doesn't mark it as modified, and instead overwrites my changes, often multiple times per PR. I had a glance through the job logs last time this happened (about 10 minutes ago), and I saw the line
branch.isModified(): using cached result "false"
. My guess is that there's either some bad cache invalidation going on or you have a time-of-check vs time-of-use bug (i.e. it was unmodified when it started the rebase, but by the time it was done I had pushed). Possibly both.Relevant debug logs
Logs
Have you created a minimal reproduction repository?
No reproduction repository
The text was updated successfully, but these errors were encountered: