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

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


1 badge earned


Participate in fun challenges

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


Gift kudos to your peers

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


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!


Git merge deleting files while merging

I have a master branch with 3 files, and I've created one develop branch from master. Now i deleted one file and made some changes in another file. 

While merging develop branch into master the file I deleted in develop keep deleting in master as well. But i want to keep those files in master, how can I do that?



1 answer

0 votes
Mikael Sandberg
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
Jun 26, 2019

Hi @Gopi Kirshna,

What you are describing is the expected result from a merge. If you remove a file in one branch, the merge will remove it in the target branch too. Please have a look at for an option to pick which files gets "merged" into master. 

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events