Thought I’d ask since have a herculean task of having to figure out what is different between 2 projects and then update-merge the 2! Is there any utility that might help automate this? In addition to the actual contents of code files it would have to check dates and sizes of all asset files.
I have seen within visual studios the option to use Visual studios for the Diff and merge tools. I haven’t had a reason to try it yet, but at work we’ve been using Visual Studios with Microsoft Azure Devops in testing to see how we like using them for a repo service.
But as for automating it, I’m not sure. It wouldn’t surprise me if there is a way to set up “Always take” conditions, but for myself I wouldn’t personally want that. I’d rather handle choosing which one to take just in case. So I don’t really have any experience setting up something like that.
Just throwing that option out there, but there are probably other choices.
This is often the responsibility of tools related to your specific version control solution.