Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Rebase not working on PR

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?

1 answer

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

This is sad that basic options just don't work

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. 

Like bigdnf likes this

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,886 views 0 7
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you