VS2010 .filter files and SVN

Posted by Noah Roberts on Stack Overflow See other posts from Stack Overflow or by Noah Roberts
Published on 2010-04-23T17:25:17Z Indexed on 2010/04/23 17:33 UTC
Read the original article Hit count: 422

Since we've switched to VS2010 we've noticed a new .filters file that apparently contains the filter structure of the project. We're also using subversion as our source control.

Unfortunately, every time we check in now we end up with merge conflicts if anyone's added a file or filter to the project. SVN seems absolutely incapable of merging this file type correctly even though it's text based. It's getting rather frustrating.

Is anyone else dealing with this problem? Has anyone found a solution?

© Stack Overflow or respective owner

Related posts about visual-studio-2010

Related posts about subversion