Jetstream Code Update Email

Click here to return to top level Code Management page.

Subject: Updated Baseline Version of Jetstream Now Available

Hi Everyone,

The recent Jetstream testing exercise has been successful. Most of you have run your test cases and no major issues with the code are evident.

The central repository now contains the updated baseline version of Jetstream. Have a look at the ‘Merge Notes’ page on the wiki to see what’s changed:

http://utoronto-comp-aero.wikispaces.com/October+2012+Merge+Notes

Please follow the instructions below to update your master version of Jetstream.

1. Clean up your testing branch and commit any pending changes
   
2. Switch over to your master branch:
   
   • git checkout master
     
3. Merge your testing branch back into your master branch
   
   • git merge <name_of_your_testing_branch>
     
4. Pull the latest and greatest from the central repository:
   
   • git pull central master
     
5. Delete the testing branch:
   
   • git branch -D <name_of_your_testing_branch>
     
6. Create a new branch and start working with your updated version of Jestream:
   
   • git branch <new_working_branch>
     
   • git checkout <new_working_branch>
     

Thanks to everyone for your help with the testing exercise. See you next month!

<Gatekeeper>