bitbucket showing diff after merge

[spratap2312]

Hi ,

I have merged a feature branch in master and I can see that files which were changing are exactly same in master and feature branch post merge.

but when I compare both the branches i still see the same diffs. this is causing issue in merge of subsequent branches which are based on this feature branch , they are showing the past changes even though they are merged.

I suspected that one revert I did after pulling master might have caused it , but i created dummy branches and did similar test and didnt see the issue.

Any idea what could be causing this ?

[Theodora Boudale]

Hi @spratap2312,

Could you please first confirm if your question concerns a Bitbucket Cloud or a Bitbucket Server repo? If you are unsure, the URL of a Bitbucket Cloud repo starts with https://bitbucket.org/, while a Bitbucket Server repo has a different custom URL. The two products have different source codebases so it's important to know which one your repo is hosted on.

I see that your question has the tag 'bitbucket-cloud', but your Bitbucket Cloud account has access to a repo that hasn't been worked on for years. Do you have a second Bitbucket Cloud account with a different email?

Kind regards,
Theodora

[spratap2312]

I am using my company bibucket which is not an org url so I can assume its a bitbucket server repo where product is installed in our env