You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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 ?
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?