BitBucket : "Fast-forward only (--ff-only)" Merge Strategy does not work.

Question

If I set the Merge Strategy as "Fast-forward only" it should stop an out of date branch from being merged to master (Merge button should be disabled), however I am able to merge.

Steps to reproduce
* Clone two copies of a single repo and create two branches from master in each
* Set the merge strategy of the repo to "Fast-forward only" disabling all others
* Make independent changes on each repo and branch and push them to the remote
* Create two pull requests and merge one of them
* It should not be possible to merge the second pull request because the source branch is now behind master

I tried this against v5.12.2 (hosted BitBucket)

This used to work in older versions.

Marini Marini · Answer

Hi @SRamay ,

Glad to hear that it works correctly now on your side. Yeah, sure, let us know if you face the above issue again.

Cheers,

Marini

Atlassian Support

SRamay · Answer

We have since upgraded to v6.4.3 and it appears to work correctly now.  I just did a small test with a dummy repo.  I will let you know if I see this again.  Thanks.

Marini Marini · Answer

Hi @SRamay

Do you still face the same issue? If yes, It would be very helpful if you can provide us with more information on the following step:

* Clone two copies of a single repo and create two branches from master in each

What are the commands that you use to clone two copies from single repo and create two branches from master in each?

* Make independent changes on each repo and branch and push them to the remote

What are the commands that you use to make changes on each repo and branch and push them to the remote?

* Create two pull requests and merge one of them

First Pull Request: What is the "Source (Repository & Branch)" and "Destination (Repository & Branch)"?

Second Pull Request: What is the "Source (Repository & Branch)" and "Destination (Repository & Branch)"?

Best Regards,

Marini