Code

Changes between Version 35 and Version 36 of CollaborateOnGithub


Ignore:
Timestamp:
03/25/10 13:58:18 (4 years ago)
Author:
mrts
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v35 v36  
    8181 * keep the changes for a particular task selt-contained in a branch, 
    8282 * frequently update the codebase with upstream changes, 
    83  * have a has-it-all branch for testing out how the different task branches interact. 
     83 * have an integration branch for testing out how the different task branches interact. 
    8484 
    8585=== Initial setup === 
     
    159159Repeat for every ticket you have worked on. 
    160160 
    161 === Testing everything in the has-it-all branch === 
    162  
    163 '''Goal''': a place to try out the code from several tasks together. `master` can not be used for this as it is used for tracking upstream. This is a temporary branch that can be removed after testing is done. 
     161=== Testing everything in the integration branch === 
     162 
     163'''Goal''': a place to try out the code from several tasks together. `master` can not be used for this as it is used for tracking upstream. This is a temporary branch that can be removed or reset to the same state as `master` after testing is done. 
    164164 
    165165 1. Create the branch 
    166166 {{{ 
    167 git checkout -b has-it-all master 
     167git checkout -b integration master 
    168168 }}} 
    169169 1. Merge in all task branches, fix any conflicts that occur in the task branches (i.e. they should merge cleanly) 
     
    174174 }}} 
    175175 1. [wiki:RunningDjangoTests Run tests] 
    176  1. Delete the branch 
    177  {{{ 
    178 git checkout master 
    179 git branch -d has-it-all 
     176 1. Reset the branch back to `master`'s state (to re-integrate all tickets again later): 
     177 {{{ 
     178git reset —hard master 
    180179 }}} 
    181180