Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-11511

Pull request merges fail with the "New changes were pushed to <branch> in <project>/<repository> while the merge was being performed. Please retry the merge." message

    XMLWordPrintable

    Details

      Description

      Atlassian status as of November 2020

      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

        1. april-409s.png
          91 kB
          Kordinator
        2. april-long-running-rescopes.png
          111 kB
          Kordinator
        3. BSERV-Howtoself-serviceanddebugrescopingproblems-051120-0256.pdf
          9 kB
          Wolfgang Kritzinger
        4. march-409s.png
          88 kB
          Kordinator
        5. march-long-running-rescopes.png
          109 kB
          Kordinator

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              ccurti Caterina Curti
              Votes:
              43 Vote for this issue
              Watchers:
              49 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:

                  Backbone Issue Sync

                  • BbS JAC Mirror <> Bitbucket Server
                    Synced with:
                    BBSJAC-276
                    Issue sync status:
                    UP TO DATE
                    Last received:
                    Last sent: