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.
May want to have a look at this article. Not specifically SourceTree, but git related:
It is based on defining a custom merge driver:
Hi all Lets make this Friday fun really fun and post one (or more) of your best jokes! The joke can be about an Atlassian product, or just a really fun joke you want to share! I’m not the best j...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot