Merging Visual Studio Project Files

[xelaju]

Vault does not seem to be merging our Visual Studio Project files. Is there a way to get vault to merge project and solution files?

Thanks,
Mike

[jclausius]

By default, the extension of Visual Studio project/solution files are not within the Vault Admin Tool's list of mergeable files. Time has shown that Visual Studio's modifications to these files creates a vast number of merge conflicts because there doesn't seem to be a standard procedure followed by each instance of Visual Studio when changes to a project or solution.

If you do need this capability, you can add to the list of extensions within the Admin Tool, but please be aware you may end up with a vast number of merge conflicts and manual merging when multiple people make large changes and VS writes those files in a different layout.