How to exclude the folder and files in merging using source tree

Hi, 

I have four agile trains and will be periodically merging into Release branch. each trains will have thier own set of config files in many folders also Release branch. these will not be merged into Release branch. 

I used .gitattributes using merge=ours, but its only working when its conflict. but config files needed to be excluded in the times. also there could be possible of modifying the config within the Agile branches. 

 

Thanks in advance. 

1 answer

May want to have a look at this article. Not specifically SourceTree, but git related:
https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b 

It is based on defining a custom merge driver:
https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver

Suggest an answer

Log in or Sign up to answer
Community showcase
Published yesterday in Agile

Are you a Jira Service Desk agent? We want to talk to you!

Are you a whiz at handling tickets and looking at how you can further optimize your workflow with automation? Do you tackle detailed customer support questions while simultaneously getting flooded wi...

24 views 0 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you