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,640,959
Community Members
 
Community Events
196
Community Groups

Merge of the pull request is overwriting the changes which were committed from previous pull request

I have an issue observed multiple times in my project.  whenever we merge the pull request from one branch into master , the changes from previous pull request merge got overwritten even though overwritten files had no changes in latest pull request. 

Steps to reproduce.

1.  Created branch from master , then committed changes and created a pull request A. This has 2 file changes f1, f2.  

2.  Created another branch from master , then committed changes and created a pull request B. This has 2 file changes f3, f4.  

3.  Merged pull request A.

4. Merged pull request B. This overwrites files changes from pull request A. Now the master contains only f3 and f4. f1 an df2 are missing.

This  happens only for certain commits and not for all. Is there any setting that  needs to be done so that we can avoid overwriting of file changes. 

 

 

1 answer

Same issue. Can someone from Atlassian please provide any answers.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events