I think that certain very high-end "asset management" or "configuration management" tools like Alienbrain have things like Photoshop and 3D Studio Max plugins to do structured conflict resolution within an editor for structured content, but I have never had the opportunity to use one, so I'm not sure if or how they work.