-
Bug
-
Resolution: Not a bug
-
Medium
-
None
-
7.21.1
-
None
-
1
-
Severity 3 - Minor
-
Problem
PR diff didn't get updated after the change made from another PR at target branch.
Environment
7.21.1
Steps to Reproduce
- Create a repository
- Push a dummy file
- Create a new branch, b1, from the master branch
- Create another new branch, b2, from the master branch
- Checkout to b1
- Modify the contents of the dummy file, commit and push the changes
- Checkout to b2
- 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
- Create a PR from b1 to master branch
- Create a PR from b2 to master branch
- Merge the PR from b1 to master branch
- 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)