Can I Configure Renovate to Rebase a PR with the Target Branch instead of the Basebranch #33659
Unanswered
BleonLimani
asked this question in
Request Help
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
How are you running Renovate?
Self-hosted Renovate
If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.
Bitbucket Server
Please tell us more about your question or problem
Hello everyone,
Our company recently started using RenovateBot to keep dependencies in our projects up-to-date. However, we are encountering an issue and are not sure how to resolve it or if it's even possible. The renovate.json configuration we are using looks like this:
Our project is hosted on Bitbucket Server, and the defined base branch for this project is develop. The projects we actively work on are under dev/VERSION + {...}. These branches are versioned in ascending order, and we auto-merge changes from the lower versions sequentially into the higher versions. As a result, develop is always up-to-date with the latest dev/VERSION... branch.
I have set rebaseWhen to never because previous attempts with rebasing did not work as expected.
The Issue:
When the bot encounters a conflict in an open PR, it updates the PR and merges the changes from the base branch (develop) into the PR branch. This behavior causes massive diffs in PRs for updates to lower dev/VERSION... versions.
Example:
The bot opens a PR:
renovate/features/DEP10 -> VERSION_1
The created branch is then based on VERSION_1. If a conflict arises, I would expect the bot to use the target branch for rebasing. However, this does not seem to be the case.
My Question:
Is it possible to adjust the configuration so that the bot exhibits the expected behavior? Specifically, can we configure it to:
Thank you!
Logs (if relevant)
Logs
Beta Was this translation helpful? Give feedback.
All reactions