Branching and merging with code repositories
What is your recommendation regarding branching and merging with code repositories (e.g. GIT) when you have a team of developers working with Matillion?
For example, you have a Master branch then Developer A branches off master to work on Feature A. Developer B branches of master to work on Feature B.
What tool would you recommend when doing merges of branches into a Master branch and what would you suggest when dealing with merge conflicts?