Changes between Version 48 and Version 49 of InstallationGuidelines/VirtualMachine

Timestamp:

01/07/12 22:46:52 (13 years ago)

Author:

Daniel Klischies

Comment:

--

InstallationGuidelines/VirtualMachine

@@ -66 +66 @@
 }}}
 
-If you are working on a specific branch for a particular event (e.g. RHoK), then update to that branch instead, e.g. :
+If you are working on a specific branch for a particular event (e.g. RHoK), then you can add that branch to your repository:
 {{{
 cd /home/web2py/applications/eden
-git checkout <BRANCH>
+git remote add BRANCHNAME https://github.com/flavour/BRANCHNAME.git
+git fetch BRANCHNAME
+}}}
+Now you have both, the trunk ("master" branch) and the specific branch ("BRANCHNAME" branch) in your local repo.
+You can switch between them:
+{{{
+git checkout master
+or
+git checkout BRANCHNAME
 }}}
 
-If, for some reason, you need a specific revision, do the following with nnnn replaced by the revision you want:
+If, for some reason, you need a specific revision of "master"/trunk, do the following:
 {{{
 cd /home/web2py/applications/eden