"X commits behind master" warning when having squashed commits

Alparslan_3mk9gr

Hi,

Bitbucket warns that my pull request is behind X commits "master". At my local environment I squashed X amount of commits (git rebase -i) which were already in master branch. With git log I see only squashed commit and previous X amount of commits have disappeared at git log.

When I make a pull request, bitbucket shows the new squashed commit correctly. But there is the behind X commits "master" warning. When I click "sync now" button next to the warning, the pull request shows there are no changes.

Can I proceed to merge the pull request although there is warning? No other people have pushed to the repository. When my workmate approves the pull request, it is possible to merge. If I can't proceed to merge, is there any workarounds?

 

 

Saxea _Flowie_

Hi @Alparslan

Refreshing the pull request page after you push might make the message go away.

Can I proceed to merge the pull request although there is warning?

Yes, but it depends on your branching strategy. Also if you merge using rebase, from the steps you described above, is likely what you are after.

If I can't proceed to merge, is there any workarounds?

If you can't proceed it will likely be because there is a conflict - someone changed something in "master" that you changed in your pull request. So you will need to resolve the conflict manually.

We provide Flowie, a Bitbucket app, that helps enforcing your branching strategy. In your case you could configure it to always merge using rebase, so you won't accidentally merge without using rebase. It also has additional merge checks that you can enable to ensure the right workflow.