''Merging conflicts by hand can be quite intimidating the first time you attempt it, but with a little practice, it can become as easy as falling off a bike.'' -- The SVN Book, Chapter 3 [http://subversion.tigris.org/ Subversion] is the revision control software in use by the NLP lab. ==Repository== Our repositories are located at http://nlp.cs.byu.edu/subversion If I wish to get a copy of the NIST HEAD code, for example, I would type :svn co http://nlp.cs.byu.edu/subversion/NIST/HEAD ==Issues== Sometimes Subversion breaks. Here's how to rescue your working copy, or at least your changes....