Details
-
Bug
-
Resolution: Fixed
-
Highest
-
4.14.12, 5.10.0, 5.12.0, 6.6.2
-
41
-
Severity 3 - Minor
-
389
-
Description
Hi everyone,
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.
Cheers,
Wolfgang Kritzinger
Senior Developer - Bitbucket Server
Issue Summary
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.
Expected Results
The merge completes successfully.
Actual Results
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
Workaround
Decline and reopen the pull request before attempting to merge again.
Attachments
Issue Links
- relates to
-
-
- Closed
-
-
BBSDEV-18961 Loading...
-
- is cloned by
-
- mentioned in
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-