When I compare a branch that was already merged to develop, it looks like the changes are not in develop - the diff shows them as not in develop. If I check the source code in develop, the changes are there. I suspect the "231 commits behind "develop"" message has something to do with this. Wouldn't the compare act on the the current develop branch - not a version 231 commits behind? I don't want to make any changes to the develop branch nor the branch I'm comparing to develop, so I hesitate to click on "sync now". What's happening here?
Hi Scott,
Since last year, Bitbucket Cloud diffs use a three-dot diff equivalent to
git diff destination_branch...source_branch
A three-dot diff shows only changes in the source branch starting at a common ancestor of the two branches.
You can read more details here:
The message "231 commits behind develop" means that there are 231 new commits in develop that do not exist in the branch you are comparing develop with. Sync now is going to merge develop into the branch you are comparing it with and you don't have to do it if you don't want to. However, syncing develop into the source branch will allow you to see a diff that would match the '3-way' diff that Bitbucket was previously using.
Kind regards,
Theodora
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.