We are unable to merge any pull requests if any changes have been made to the target branch. Here's a basic example that happens every day:
We are unable to merge pull requests if ANY changes were made to the target branch after the pull request was created. I would expect it to deny the merge if there were actual merge conflicts, but it happens every time whether there are merge conflicts or not.
We are on Bitbucket Server 5.9.
What happens when you re-try your merge attempt after some time?
There is a known Bitbucket Server issue. When the target branch is updated, Bitbucket starts background re-scoping to update all pull requests opened against this branch. While re-scoping is running, other pull request will fail to merge.
Here is the issue I am referring to: https://jira.atlassian.com/browse/BSERV-9709
I know this is an old thread, but we experience this often. As this is still indexed on google, I though this might be useful for others.
I found that pushing directly to your target branch resolves this issue. You would need to adjust your settings in the repo to allow direct pushes if you have prevented this.
PR from feature/abc -> develop
clicking merge on BB server UI fails with above error.
on local env:
After this, bitbucket will automatically mark the original PR as merged, and you should be able to merge any other PR's now without issue.
Hello Community, I’m Anton Genkin, a product manager on the Bitbucket Server and Data Center team and am excited to share that Bitbucket Server 7.0 is now available! It's a platform release, one th...
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