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 18:34] – davegriffithslirec:version_control_guide [2009-02-04 18:41] – davegriffiths
Line 55: Line 55:
 Firstly go to a directory where you want to keep your code and run: Firstly go to a directory where you want to keep your code and run:
  
-<code>svn checkout svn+ssh://yourlogin@svn.lirec.eu</code>+<code>svn checkout --username yourlogin http://svn.lirec.eu</code>
 Replace "yourlogin" with your lirec website login. The username is required so svn knows who changed what. Read-only anonymous access is also available. Replace "yourlogin" with your lirec website login. The username is required so svn knows who changed what. Read-only anonymous access is also available.
  
Line 96: Line 96:
 <code> <code>
 <<<<<<< .mine <<<<<<< .mine
-void GraphNode::ProcessChildrenChangedHereToo(unsigned int bufsize)+void GraphNode::ProcessChildren_I_Changed_This(unsigned int bufsize)
 ======= =======
-void GraphNode::ProcessChildrenChanged(unsigned int bufsize)+void GraphNode::ProcessChildren_I_Changed_This_Too!(unsigned int bufsize)
 >>>>>>> .r150 >>>>>>> .r150
 { {
Line 112: Line 112:
 </code> </code>
  
-You can then choose which line to use.+You can then choose which line to use, save and commit the change.
  
 ====Diffing==== ====Diffing====
  • lirec/version_control_guide.txt
  • Last modified: 2009-02-09 11:01
  • by 81.188.78.24