Hey,
we're planning on doing CI with salesforce, in the sandbox per developer model , and one shared integration environment.
For the code/metadata etc. to synchronize changes from integration (shared dev env) to all downstream local dev envs - each dev before his commit to integration repo - does pull / update to ensure he sees all changes from other devs, resolves any merge conflicts in git, and then uses ANT to deploy the code to his local dev env so that he has the freshest version in the sandbox. Does this make sense / is the right way to do it ?
If so - what to do with any manual changes (profiles, etc. or artifacts that are not stored in git and you need to configure them manualy on the box) ? Did you have any experience with that? How do you track that and ensure they are propagated downstream ?
Thanks!
J
