I'm trying to find out why my feature branch pull request to master branch shows commits which are already part of master. I was hoping to see only changes that I made in feature branch that are new to master branch.
This is what I have done so far
1. Created a feature branch based off of a released tag (older than latest released tag).
2. Merged latest released tag changes to this feature branch.
3. Made some new changes
4. Created a pull request from this feature branch to master.
Changes that got merged from the latest released tag (step 2) are showing up in my pull request along with new changes I made. Please not that changes from released tag are already present in master branch as we always release our code from master branch.
I'm not sure if I'm doing something wrong here or if there is another way to make sure my pull request will show only changes which are new to target branch.
Thank you in advance!
Hi, @Deepak S!
I tried to reproduce this scenario, but I couldn’t see the behavior you see, so I assume you are doing something different than I did. In this case, I will need some additional details to further investigate this issue.
For step 1: does the tag you are creating the new branch from belong to master?
For step 2: are you merging a certain tag that belongs also to master in that new feature branch?
Which merge strategy do you use?
It would also be helpful if you could give an example of commit graph (using letters instead of commit hashes), e.g. like (where A, B, C are commits):
A - B (tag 1.0) - C - D - E (tag 2.0) - F [master branch]
G [feature branch]
and explain what they do, the exact commands you use, and what you see using that example commit graph. This will help me understand what you’re doing, try to reproduce, and see if it’s expected or not.
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events