Any tips on using Subversion with .net project files?

Question

We just switched from TFS to SVN, and we still love it.

However, he did introduce some new problems.

One way to process project files (.vbproj). The .vbproj file, of course, always changes as files and links change, and if several people encounter conflicts, conflicts will occur.

Oddly enough, in TFS we never had to deal with managing these conflicts, this part was automatically processed. Now in SVN, we iterate over XML in the merge tool, and there have already been some errors.

How do you deal with this? Any tips?

EDIT: By the way, we are using VisualSVN.

Answer 1

SVN * proj - / , , .

, .

.sln .vbproj, .suo, .

Answer 2

, .

, , , "mine before theirs". .

, . , . , .

Answer 3

, * proj file + - + . .

Answer 4

, ? .vbproj svn: mime-type , "text/" Subversions .

VSS , . mime .

Answer 5

VisualSVN. TortoiseSVN, Subversion Visual Studio. svn: ignore , . .

Answer 6

AnkhSVN. 2. .suo .., VS 2008, !

Answer 7

, Toroise. , ive .vbproj, diff.

id use _svn instead of .svn, for several reasons, I can’t remember why now with my head, but "." caused me grief.

make sure that you do not run the .user and .suo files, otherwise you will continue to get VS settings for the project, annoying!

You can also get client attachments for VS, such as ankh and visual svn, and only used ankh for bits, but it was a bit slow, but that was probably my PC error.