In our company we are using on premise bitbucket version 6.10 and we have some problems when trying to use rebase on PR. We have activate merge strategy “Rebase + Fast-forward” but this option is not working when there is any commit we are not rebased on locally. Even if this commit is not conflicting with our changes bit bucket is not able to do rebase.
Additionally when we try to use “Rebase” option available in PR (on three dot menu) it always says that we have to rebase locally (said again – even when we have no conflicting changes).
Is this known problem or maybe we have to change some global option to make it work?
FFIW, I have have never got this merge method on a PR to work either.
I see problems like this all over like in this thread:
https://stackoverflow.com/questions/59056486/bitbucket-merge-conflict-issue
I just reviewed my notes and synced up with a few friends who are also HEAVY BitBucket server users, there are TONS of problems with with the rebase merge PR strategies.
Unless an Atlassian corrects me, I would consider it semi-broken.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.