Thanks for voting and commenting on this bug. Your input in the comments helps us understand how this affects you and how to reproduce this issue.
We fixed numerous subtle bugs in the rescoping process and this has resulted in a significant reduction of this problem in our internal environments. We encourage to upgrade to any of the fix versions mentioned in this ticket and provide feedback if the issues have been resolved.
In addition, take a look at BSERV-Howtoself-serviceanddebugrescopingproblems-051120-0256.pdf for more information about what exactly has been fixed and ways to further diagnose and fix this class of problems.
Senior Developer - Bitbucket Server
When merging a pull request, the user received the following message:
New changes were pushed to <branch> in <project>/<repository> while the merge was being performed. Please retry the merge.
While this is expected when a change occurs on the target branch during the merge, this can occur also when no changes are received.
Steps to Reproduce
This has been noticed in busy environments.
The merge completes successfully.
The merge does not complete.
There are no exception in the logs, this message is only logged at debug level
com.atlassian.bitbucket.scm.MergeException: New changes were pushed to <branch> in <project>/<repository> while the merge was being performed. Please retry the merge
Decline and reopen the pull request before attempting to merge again.