Hello, > Hi: I've recently started using VisualSVN and am trying to manage a > web-development project in VS2013. What's happening is the developer is > committing changes, I'm trying to update my copy and build to test the > changes. > > I am running into issues with various files ending up in a conflicted state > and unmergable, like the compiled bin and obj directory dlls. I'm wondering > if there's a "best practice" for managing VS projects in Visual SVN so that > I can avoid the endless conflicts?
The best practice is to add temporary / autogenerated items (for example, build artifacts) to ignore list and keep these items out of the version-control. In other words, if you build an executable, you should store its source in version-control but not the build itself. The most widely-used way to ignore items in a Subversion working copy is to use "svn:ignore" versioned property. See SVNBook chapter "Ignoring Unversioned Items" at http://www.visualsvn.com/support/svnbook/advanced/props/special/ignore/ and TortoiseSVN Manual "Ignoring Files And Directories" at http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-ignore.html > Or if someone can just give me some guidelines as to how to set up a project > using Visual SVN and the VS plugin/Tortoise so that multiple users can work > on a single project? When adding a Visual Studio solution via VisualSVN | Add Solution to Subversion wizard, VisualSVN configures "svn:ignore" property on each project directory to ignore Bin, Obj and Release directories as well as for other items that should not be versioned by default. You can adjust ignore pattern for newly created projects in Visual Studio | VisualSVN | Options. If the Visual Studio solution was added by other means, then the repository most likely was not configured to ignore those items you get conflicts with. If the files you want to ignore / exclude are already in the repository, they have to be deleted from the repository first and then added to the ignore list / ignore pattern. VisualSVN has a shortcut for this: "Exclude from Subversion" command that is available for versioned items in VisualSVN context menu. You can also adjust the ignore pattern for the existing solution by right-clicking solution node in Solution Explorer, choosing VisualSVN | Properties and adjusting "svn:ignore" property pattern. The default ignore pattern for Visual Studio solution is [[ *.suo *.ncb *.sdf *.opensdf ipch *.user _ReSharper.* ]] The default pattern for Visual Studio project is [[ [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto ClientBin GeneratedArtifacts _Pvt_Extensions ]] Hope it helps! -- With best regards, Pavel Lyalyakin VisualSVN Team -- You received this message because you are subscribed to the Google Groups "VisualSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to visualsvn+unsubscr...@googlegroups.com. To post to this group, send email to visualsvn@googlegroups.com. Visit this group at http://groups.google.com/group/visualsvn. For more options, visit https://groups.google.com/d/optout.
