View stunning SlideShares in full-screen with the new iOS app!Introducing SlideShare for AndroidExplore all your favorite topics in the SlideShare appGet the SlideShare app to Save for Later — even offline
View stunning SlideShares in full-screen with the new Android app!View stunning SlideShares in full-screen with the new iOS app!
Choose the server… svnserve Easy to set up Can be used with SSH Apache HTTP Server Harder to set up HTML repository browsing Multiple authentication methods
svnserve Available for multiple platforms Windows: http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-serversetup-svnserve.html Mac: http://developer.apple.com/mac/library/documentation/Darwin/ Reference/ManPages/man8/svnserve.8.html Linux Package Manager
Creating a repository Linux & Mac OS X: $ svnadmin create /home/jordan/repo Windows: svnadmin create C:Repo
Choose A Client… Command Line! “Out of the box” SVN support on Mac OS X Easy to install on Linux Binaries for Windows – http://subversion.tigris.org/ GUIs Tortoise SVN – Windows only IDE Plugins Versions App for Mac
Resolving Conflicts $ svn status C myproject/login.php
Resolving Conflicts Four ways of resolving conflicts: Overwrite with your version of the file Overwrite with the existing version Merge the changes manually Merge using a merge tool
RESOLVING CONFLICTS $ svn resolve --accept working myproject/login.php Resolved conflicted state of ‘myproject/login.php' $ svn commit -m “Added login session check.” Sending myproject/login.php Transmitting file data . Committed revision 6.
Creating Branches & Tags It’s just a copy of a folder… Merge changes back into trunk later $ svn copy /project/trunk /project/branches/1.0 $ svn copy /project/trunk /project/tags/1.0 $ svn copy /project/branches/1.0 /project/tags/1.1