Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

bitbucket showing diff after merge

spratap2312
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
February 27, 2023

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 ?

1 answer

0 votes
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 1, 2023

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'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
March 1, 2023

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

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Product Admin
TAGS
AUG Leaders

Atlassian Community Events