Changes between Version 64 and Version 65 of DeveloperGuidelines/Git


Ignore:
Timestamp:
09/18/13 09:44:26 (8 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v64 v65  
    173173}}}
    174174
    175 === Creating a 2nd branch ===
    176 If you wish to have multiple separate branches to work on, you can run these as separate web2py applications
    177 * Create a fresh Clone:
     175=== Creating a second branch ===
     176You may want multiple branches in your repository, e.g. for working on separate tasks, or for experimentation, or as a
     177backup before doing a rebase.
     178
     179=== Creating a second working directory and repository ===
     180If you wish to have multiple directories containing different branches, you can run these as separate web2py applications.
     181(Note this is not a standard manner of working when using git, and is generally only needed if you are working on multiple
     182projects at the same time, and need to preserve their databases and other state.)
     183* Create a fresh clone:
    178184{{{
    179185cd web2py/applications
    180 git clone git@github.com:flavour/eden.git <mybranch>
    181 }}}
    182 * Setup a new Repository on GitHub: https://github.com/repositories/new
    183 * Edit {{{.git/config}}}:
    184 {{{
    185 [remote "origin"]
    186     fetch = +refs/heads/*:refs/remotes/origin/*
    187     url = git@github.com:<mygitusername>/<mybranch>.git
    188 }}}
    189 * Push to GitHub:
    190 {{{
    191 cd <mybranch>
     186git clone git@github.com:flavour/eden.git <new_repository>
     187}}}
     188* Setup a new repository on !GitHub -- see: https://github.com/repositories/new
     189* Add remotes.
     190{{{
     191git remote add upstream git@github.com:flavour/eden.git
     192git remote add origin git@github.com:<my_git_username>/<new_repository>.git
     193}}}
     194* Push to !GitHub:
     195{{{
     196cd <new_repository>
    192197git push -u origin master
    193 git remote add upstream git://github.com/flavour/eden.git
    194198}}}
    195199