We are working a project jointly with another consulting firm. For the most part we each have our own domains, but there is a little crossover.
Let’s say we both modify an entity that has conflicting changes. Using the “last one in wins” rule, whichever solution is imported last will have its change implemented.
Is there a tool or some known methodology for identifying these conflicts before the import is done to help us manage this problem?
I have run into this numerous times and my approach has been to export the customizations and inspect the contents of the customizations files (xml files) with a code comparison tool like, WinDiff or BeyondCompare.