pull requests show changes which are already merged in destination branch

Vinay Talla

Below is sequence of steps performed to validate missing lines in Bitbukect:

 

created clone branches for dev, stage and master as dev-XCC-2780, stage-XCC-2780, master-XCC-2780

created a local branch XCC-2780 from master and added a line "# BitBucket Missing Files XCC-2780, created branch from master" in the file "Clair-Setup/clairScanImages.sh"

merged XCC-2780(local branch) to master-XCC-2780(master clone)

created branch XCC-2780-1 from dev and made same changes as above and merged to dev-XCC-2780

also merged changes from dev-XCC-2780 to stage-XCC-2780

As above changes already merged to master-XCC-2780 from branch XCC-2780(local branch), so the pull request from stage-XCC-2780 to master-XCC-2780 should be empty but we see same changes been displayed.

Patrik S

Hello @Vinay Talla ,

and welcome to the Community!

From the information you have shared with us, the reason why you are still seeing these merged changes in the pull requests' diff is that back in 2022 we changed how we compute diffs in bitbucket from previously comparing both branches HEAD's, to now compute diff(topic diff) between the source branch HEAD and the common-ancestor (merge-base). The merge-base is the point in history where the branches started to diverge. This change was described in detail in the following blog post:

• https://bitbucket.org/blog/improving-performance-on-complex-diffs

The fact that the diff shows previous modifications that might be already in the destination branch is simply because, from the diff point of view, they are added in the source branch.

In order to fix this disparity between the branches, you can either rebase or synch the branches on the Pull Requests page by clicking on the Sync now button in the Pull Request page.

This will merge the destination branch into the source branch and the diff will show only the "new" changes introduced by the source branch of the pull request. For more details on that please refer to How to see changes to a destination branch in a Pull Request.

Hope that helps! Let me know in case you have any questions.

Thank you, @Vinay Talla !

Patrik S