Changes between Version 68 and Version 69 of InstallationGuidelines/VirtualMachine

Timestamp:

10/04/13 08:28:41 (11 years ago)

Author:

Pat Tressel

Comment:

--

InstallationGuidelines/VirtualMachine

@@ -61 +61 @@
 {{{
 cd /home/web2py/applications/eden
-git pull upstream master
+git pull origin master
 }}}
+
+(If / when you set up your own !GitHub repository that is a "fork" of the main Eden repository, you'll want to change the name of the main Eden repository from "origin" to "upstream", so that you can use "origin" to refer to your own repository.)
 
 If you are working on a specific branch for a particular event (e.g. RHoK), then you can add that branch to your repository:
@@ -71 +73 @@
 }}}
 Now you have both the trunk ("master" branch) and the specific branch <branch_name> in your local repo.
-
 
 If, for some reason, you need a specific revision of the current branch, do the following: