SVN Merge Headaches


Problem: You work on a team using svn source repository and you are plagued with merge conflicts.

Solution: Simply put use ignore. All team members need to have the ignore list setup so that only developer generated content is being submitted. User files and compiled project files should be omitted.

In my development environment I use Visual Studio 2008(C# mostly) and Resharper. My automated builds compile to a folder called “build.”

My ignore list:

.DS_Store _ReSharper.* Thumbs.db obj bin *.suo build *.user buildout.txt