<p>We just switched from TFS to SVN, and so far we're loving it.  </p>

<p>However, it did introduce a few new issues.</p>

<p>One is the way project files (.vbproj specifically) are handled. The .vbproj file is of course always changing as files and references are changed, and if a few people are collaberating there will be conflicts. </p>

<p>Oddly, in TFS we never had to deal with managing those conflicts, that particular piece was automagically handled. Now in SVN, we're mucking through XML in the merge tool and there have already been some mistakes.  </p>

<p>How do you handle this? Any tips?</p>

<p><strong>EDIT:</strong> by the way, we're using VisualSVN.</p>

This particular issue occurs if multiple developers add files to the same project.
To resolve a conflict when multiple developers have added files to the same project, you can usually make it work by resolving using "mine before theirs" option. It'll add both your changes together.
This issue and other merge issues are alleviated by committing and updating often. Commit once a day or more if possible. The longer you go without updating and committing, the more pain you and your team will feel.