How do I get the solution and project names back in sync?

问题

I've created a SSRS report and checked it into TFS 2015. Later we had to do work on it, while leaving the original alone, so I branched it, creating a -Dev branch. I am working with a junior developer. She didn't understand that it was both necessary and sufficient to have the different solutions, representing the different branches, in different locations on her hard drive, to differentiate between the main branch and the dev branch. She did that, but then in the dev branch she proceeded to rename the solution and project files. Merging these things back is becoming a larger issue than it should normally be.

Here's what's in the solution file:

Project("{F14B399A-7131-4C87-9E4B-1186C45EF12D}") = "Legacy LTBI Data-Dev", "Legacy LTBI Data\Legacy LTBI Data-Dev.rptproj" ...

and later in the file there's:

SccProjectUniqueName1 = Legacy\u0020LTBI\u0020Data\Legacy\u0020LTBI\u0020Data-Dev.rptproj

I don't want -Dev there at all. Do I edit the .sln file and remove it here? Or is there another way I should change this?

来源：https://stackoverflow.com/questions/55028877/how-do-i-get-the-solution-and-project-names-back-in-sync