Changes between Version 32 and Version 33 of Event/2014/GCI

Timestamp:

12/05/14 21:58:25 (10 years ago)

Author:

Pat Tressel

Comment:

--

Event/2014/GCI

@@ -79 +79 @@
 
 You can call your local branch whatever you want. One suggestion is to pull a fresh copy of the staging branch when you are about
-to start a new task. You can keep any old branch you were working on for previous tasks, or delete it after your pull request for
-the previous task is accepted and merged into the staging branch.
+to start a new task. (You can keep any old branch you were working on for previous tasks, or delete it after your pull request for
+the previous task is accepted and merged into the staging branch. But it is better not to reuse that branch to avoid unexpected
+merge issues with new work. If you want to use the same branch name, then you can rename your old branch.)
 
 Note, your commits will still have your name on them as author when they get into the main repository!
@@ -96 +97 @@
   You will need to change both, to the GCI repository and the "staging" branch.
   * There will be a down-arrow next to the repository -- that will give you a list of repositories. Select the GCI repository.
-  * Then use the down-arrow on the branch -- select your branch.
+  * Then use the down-arrow on the branch -- select "staging".
 * Create the pull request.
 * Continue with the code review as usual.