We need a system that allows multiple admins and developers to make changes in salesforce meta data and merge them while resolving conflicts in an automated by as possible.
Anyone have good free solutions?
Thanks
One solution could be a server with GIT (version controlling) and Jenkins (continuous integration):
SFDC <N---1> GIT/Jenikins machine <1---N> Local (admin/administrator) machine
The simplified procedure:
The metadata is pulled from the Salesforce to the GIT. Each user works with an individual branch and committed changes to the master. Then changes are deployed back to the Salesforce.
Related topics: