Summary

If a user tries to merge a pull request with squash-ff-only strategy, and the merge fails due to the fact that target branch has another commit which doesn't exist on the source branch when the user wants to do a rebase – the rebase button is then greyed out apparently due to merge conflict. However, when the pull request page is refreshed, the rebase option is then available again.

Steps to Reproduce

• Create a repo on Bitbucket – push in a new commit into the repo
• Checkout a new branch (develop), and then make some changes in the repo, and push it to the develop branch
• Checkout the master branch, perform some changes in the repo and push the changes into the master branch
• Create a pull request – with develop branch as the target branch and master as the source branch
• Make sure the merge strategy is set to allow only the squash-ff-only strategy.
• Try to merge the pull request – the pull request will fail to merge due to the repo is configured to require fast-forward merges and the target branch contains commits which are not present in the source branch.
  
• Cancel the merge attempt
• Attempt to perform a rebase from the pull request

Expected Results

Users will be able to perform a rebase

Actual Results

The rebase option is greyed out after the merge attempt is cancelled

Workaround

Refresh the pull request page. The rebase button should be available again after the page refresh