Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,360,148
Community Members
 
Community Events
168
Community Groups

See all 5 Pull request merge strategies in Bitbucket Cloud

According to https://confluence.atlassian.com/bitbucketserver/pull-request-merge-strategies-844499235.html, there are 5 different merge strategy options available for merging pull requests, however I can only see 2 of them from my Bitbucket Cloud account:
-Merge commit --no-ff
-Squash --squash

Does Bitbucket Cloud only support 2 out of 5 supported strategies in Bitbucket Server 4.9 or am I missing something?

Thank you beforehand,
Victor

6 answers

Not having a `rebase + merge --ff-only` option is a deal breaker for me. Could this please be prioritized?

It's been a year, any updates on this?

Like # people like this

gitlab too

Hi guys!

 

Just a friendly reminder that this option would be quite useful and that actually has been sitting here for quite a while, can we expect to have this option implemented sometime in the (hopefully, near) future?

 

We are missing the `rebase` option as well.

 

Thanks!

Ya, we're considering moving away from BitBucket because of the lack of rebase.

We were looking at moving to Jira for Project Management because of its close integration with Bitbucket, but we're holding off for now until we figure out what we do with this.

Same here, please integrate: rebase + merge --ff-only, otherwise Azure DevOps will be our new friend

Hi, 

Any update about it ? 

It is really disturbing with the branch permission's check "Reset approvals when the source branch is modified" because our teams need to manually rebase their jobs before merging and reapprove the pull requests. 

You thinks that's normal ? Me NO !

0 votes

Hi Victor,

You're correct. Sorry for the confusion. There are variances in the feature set offered by the Cloud and Server versions of Bitbucket, and in this case Server is slightly ahead of Cloud in terms of functionality. For now, Bitbucket Cloud currently supports only a subset of the merge strategies available in Bitbucket Server. 

cheers,

Tim

Any update on this suggestions ?

There is a 4 years old ticket about this issues !!!

https://bitbucket.org/site/master/issues/6106/provide-the-option-to-use-git-merge-ff

Like # people like this

Any updates on this, I really want the rebase + merge --no-ff option available.

Any updates on when this will be available on BitBucket Cloud? We also use the "rebase + merge --no-ff" option to merge feature branches.

Not having a rebase + merge --ff-only option is a deal breaker for me. Could this please be prioritized?

Is it still not a thing on the cloud? This is a very key feature for big project

Like Michael Fasani likes this

This feature would save me a couple hours each week of checkout out branch, rebasing, and then push --force before finally merging.

Like # people like this

hi @Peter Klooster could you elaborate on how you do rebase & merge? I understand you check out the PR branch, rebase master onto it, check out master, rebase the PR branch onto master and then push --force?

@Rodolfo Ortiz with the PR branch being checked out:

git fetch --all
git rebase origin/master
git push -f

You only rebase the feature branch on top of master, it doesn't make sense to rebase master on your feature branch.

Got it @mafa . And then, in order to merge, you would only need to do this to achieve a rebase&merge right?

git checkout master
git merge --no-ff PR_branch_being_checked_out
git push

Like Ray Depew likes this

Yes exactly

> "For now,"

It's _now_ 2021. How long is this "for now" period supposed to last? Asking for a friend.

Like # people like this

Almost 4 months into 2022 and its still missing. but I have fancy new UI that noone asked for...

My team refuses to accept merge commits which prevents us from using pull requests.

Is there some way I can mark the PR merged without actually merging it?

Also, is somebody from Atlassian actually monitoring community threads?

Is it possible to build a plugin to support it?

Like Daniel Marra likes this

Suggest an answer

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

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

3,469 views 3 10
Read article

Atlassian Community Events