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.
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
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.