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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Tuesday in Uncategorized

Friday fun: how many celebrates Midsummer holiday or is this a Swedish tradition only?

Any other country that celebrates Midsummer holiday (this friday 22 June)?  

42 views 3 1
Join discussion

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