Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision		 Previous revision
Next revisionBoth sides next revision
lirec:version_control_guide [2009-02-04 15:12] – davegriffithslirec:version_control_guide [2009-02-04 15:15] – davegriffiths
Line 55: Line 55:
  
 <code>svn add filename</code> <code>svn add filename</code>
-Will add individual files, or recursively add files in a directory.+Will add individual files to the repository, or recursively add files in a directory.
  
-====Directories, moving, removing====+====Adding directories and moving files====
  
 <code>svn mkdir mydirectory</code> <code>svn mkdir mydirectory</code>
Line 69: Line 69:
 <code>svn update</code> <code>svn update</code>
  
 +This will merge everyone's changes (if any have been made) into your working directory. If there is a conflict (two people have changed the same line) it will emit an error message, and insert both lines into the source file in question with lots of <<<<<<<<< so it will be obvious what is going on.
  • lirec/version_control_guide.txt
  • Last modified: 2009-02-09 11:01
  • by 81.188.78.24