Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-13375

PR diff didn't get updated after the change made from another PR

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Not a bug
    • Icon: Medium Medium
    • None
    • 7.21.1
    • Pull Request - Merge
    • None

      Problem

      PR diff didn't get updated after the change made from another PR at target branch.

      Environment

      7.21.1

      Steps to Reproduce

      1. Create a repository
      2. Push a dummy file
      3. Create a new branch, b1, from the master branch
      4. Create another new branch, b2, from the master branch
      5. Checkout to b1
      6. Modify the contents of the dummy file, commit and push the changes
      7. Checkout to b2
      8. Modify the contents of the dummy file, with the exact same contents from the change made to the file from b1, commit and push the changes
      9. Create a PR from b1 to master branch
      10. Create a PR from b2 to master branch
      11. Merge the PR from b1 to master branch
      12. Check the PR from b2 to master branch and notice the diff was not updated to reflect the changes

        Expected Results

        It is expected Bitbucket would detect the changes in the files and display the warning informing the PR cannot be merged and the conflict should be resolved.

        Actual Results

        Bitbucket acts as the file was not changed, it does not update the PR {{diff} option and allow the user to merge the remaining PR pushing the exact same change that was previously merged to master branch.

        Workaround

        (Add a workaround, if available)

      Notes

              Unassigned Unassigned
              3155ac09a88b IHME SA
              Votes:
              1 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: