Subversion (svn) is a version control system initiated in 1999 by CollabNet Inc. It is used to maintain current and historical versions of files such as source code, web pages, and documentation.
Branches are used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is merged back into the main branch (trunk).
Mark a particular revision as a release version using tagging, so we can at any time recreate a certain build or environment.
SVN: Resolving conflicting changes
AnkhSVN: Subversion Support for Visual Studio
SVN Merge
- Test Run
- Merge Tree
- Resolve
- Clean Up - Refresh Overlay