Changes between Version 64 and Version 65 of DeveloperGuidelines/Git

Timestamp:

09/18/13 09:44:26 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -173 +173 @@
 }}}
 
-=== Creating a 2nd branch ===
-If you wish to have multiple separate branches to work on, you can run these as separate web2py applications
-* Create a fresh Clone:
+=== Creating a second branch ===
+You may want multiple branches in your repository, e.g. for working on separate tasks, or for experimentation, or as a
+backup before doing a rebase.
+
+=== Creating a second working directory and repository ===
+If you wish to have multiple directories containing different branches, you can run these as separate web2py applications.
+(Note this is not a standard manner of working when using git, and is generally only needed if you are working on multiple
+projects at the same time, and need to preserve their databases and other state.)
+* Create a fresh clone:
 {{{
 cd web2py/applications
-git clone git@github.com:flavour/eden.git <mybranch>
-}}}
-* Setup a new Repository on GitHub: https://github.com/repositories/new
-* Edit {{{.git/config}}}:
-{{{
-[remote "origin"]
-    fetch = +refs/heads/*:refs/remotes/origin/*
-    url = git@github.com:<mygitusername>/<mybranch>.git
-}}}
-* Push to GitHub:
-{{{
-cd <mybranch>
+git clone git@github.com:flavour/eden.git <new_repository>
+}}}
+* Setup a new repository on !GitHub -- see: https://github.com/repositories/new
+* Add remotes.
+{{{
+git remote add upstream git@github.com:flavour/eden.git
+git remote add origin git@github.com:<my_git_username>/<new_repository>.git
+}}}
+* Push to !GitHub:
+{{{
+cd <new_repository>
 git push -u origin master
-git remote add upstream git://github.com/flavour/eden.git
 }}}