SVN - Chevtek.io

Sign in Subscribe

SVN

A collection of 3 posts

AnkhSVN Basics Tutorial

I recently finished a TortoiseSVN Basics Tutorial [http://www.codetunnel.com/blog/post/91/tortoisesvn-basics-tutorial]. While TortoiseSVN is great, I really enjoy using a plugin for Visual Studio called AnkhSVN [http://ankhsvn.open.collab.net/]. The benefit of using Ankh is the built-in solution explorer support and pending changes window.

TortoiseSVN Basics Tutorial

I have recently found myself explaining the basics of SVN (more specifically, TortoiseSVN) to some of my peers. This is a simple subject that can rapidly spiral out of control, going from simple to pull-your-hair-out-crazy in no time at all. Below is a comprehensive list of the most basic instructions

Ever merge with SVN and mess up when resolving conflicts? Read on.

Does this look familiar? <<<<<<< .mine =======

<<<<<<< .mine =======

>>>>>>> .r2348 This is what Subversion [http://en.wikipedia.org/wiki/Subversion] (SVN) does to your files when it detects conflicts between your working copy and what it is pulling down from the server. It marks them as conflicted and inserts these metadata