Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,559,974
Community Members
 
Community Events
185
Community Groups

Pull request shows commits which are already present in target branch.

Hello,

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! 

1 answer

0 votes
Caroline R
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Sep 27, 2021

Hi, @Deepak S! Welcome to the community! 

Could you please confirm if this problem is occurring on Bitbucket server or Bitbucket Cloud? 

Thank you! 

Kind regards,
Caroline

Hello Caroline, Thank you for the response! It is happening on Bitbucket Cloud. 

Caroline R
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Sep 28, 2021

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.

Thank you!

Kind regards,
Caroline

Hi,

I do not know if this is the case with @Deepak S , but I have a problem with PR commits that appear despite the fact that they are already present on the target branch. The situation is shown in the picture below. After updating branch B (M-> B) and creating a PR from B to D, all commits from branch A reappear in that PR.

bitbucket_pr.png

Like Lijith Gopinath likes this

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events