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 Community! The Jira Service Desk marketing team is looking for customers who have successfully switched from Zendesk to Jira Service Desk! We’d love to hear your thoughts on the pros and ...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs