Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
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

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,463,433
Community Members
 
Community Events
176
Community Groups

Git merge deleting files while merging

Gopi Kirshna
Gopi Kirshna Jun 25, 2019

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

Answer
Watch
Like Be the first to like this
11300 views

1 answer

0 votes
Mikael Sandberg
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. 

Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS

Atlassian Community Events

See all events