A workaround for the solution (file)
Dealing with merge conflicts in the solution (.sln) file is a pain, and it seems I am not the only one annoyed by the cryptic format: [Discussion] Clean up sln (VisualStudio solution) files Nick Craver on Twitter Sadly Microsoft hasn’t done anything to improve the situation (yet), but people in the .NET community has played around with creating a new format for the solution file: JeffCyr/MSBuild.SolutionSdk . While such an approach is very interesting and could be the future of ....