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

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

Benit Jesumarian November 4, 2015

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

0 votes
xorcus March 29, 2016

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
TAGS
AUG Leaders

Atlassian Community Events