Changes between Version 35 and Version 36 of CollaborateOnGithub

Timestamp:

Mar 25, 2010, 3:58:18 PM (14 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -81 +81 @@
  * keep the changes for a particular task selt-contained in a branch,
  * frequently update the codebase with upstream changes,
- * have a has-it-all branch for testing out how the different task branches interact.
+ * have an integration branch for testing out how the different task branches interact.
 
 === Initial setup ===
@@ -159 +159 @@
 Repeat for every ticket you have worked on.
 
-=== Testing everything in the has-it-all branch ===
-
-'''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.
+=== Testing everything in the integration branch ===
+
+'''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.
 
  1. Create the branch
  {{{
-git checkout -b has-it-all master
+git checkout -b integration master
  }}}
  1. Merge in all task branches, fix any conflicts that occur in the task branches (i.e. they should merge cleanly)
@@ -174 +174 @@
  }}}
  1. [wiki:RunningDjangoTests Run tests]
- 1. Delete the branch
- {{{
-git checkout master
-git branch -d has-it-all
+ 1. Reset the branch back to `master`'s state (to re-integrate all tickets again later):
+ {{{
+git reset —hard master
  }}}