Problem with csproj files
Moderator: SourceGear
Problem with csproj files
They are not a mergeable type, yet seem to be included and are critical to VS.NET projects. What gives?
See http://support.sourcegear.com/viewtopic ... oj+merg%2A for a thread about the csproj file being mergable.
The short answer is that you can add csproj as a Mergeable file in the Admin Tool, but it isn't that way by default, because Visual Studio generates the file, and it usually doesn't merge very well if two people make changes at the same time.
The short answer is that you can add csproj as a Mergeable file in the Admin Tool, but it isn't that way by default, because Visual Studio generates the file, and it usually doesn't merge very well if two people make changes at the same time.