It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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?

 

Thanks

1 answer

0 votes
Mikael Sandberg Community Leader 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 https://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/ for an option to pick which files gets "merged" into master. 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Training & Certification

Limited Time Only—Get Super Fan Pricing on Training & Certification at Atlassian Summit 2020

Summit 2020 is one of your best opportunities to get trained—or certified—in Atlassian products. You'll be in an exciting atmosphere, surrounded by Atlassian experts who are all eager to help ea...

205 views 2 4
Read article

Community Events

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

Events near you