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

Creating merges used to show pull request diffs sometimes fails

    XMLWordPrintable

Details

    Description

      When a pull request is created or updated, Bitbucket Server automatically merges the relevant branches and uses the resulting merge to display the pull request's diff. Performing the merge allows the system to visualize conflicts between the two branches in the diff.

      However, for various reasons, creating that merge can fail. For example:

      • Submodules can cause merge conflicts (see BSERV-9243)
      • Extremely large merges can timeout
      • Unexpected Git output can result in incorrect handling

      Regardless of the root cause, when the merge can't be created it can be difficult to determine why and try to address it. More importantly, though, it makes pull requests difficult to use and rely on in affected repositories.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              bturner Bryan Turner
              Votes:
              10 Vote for this issue
              Watchers:
              15 Start watching this issue

              Dates

                Created:
                Updated:

                Backbone Issue Sync