Jetstream Upcoming Merge Group Email

Click here to return to top level Code Management page.

Subject: Upcoming Jetstream Code Merge

Hello upcoming code mergers!

It's that time again and you are the next scheduled Jetstream code merge group. I’m sending this email to give you some time in advance to get your code ready for the upcoming merge activities. In preparation for the merge, you might consider doing the following:

• Plan a merging date amongst yourselves when you can all be at UTIAS at the same time. This should make the merge/conflict resolution process go more smoothly.
• Move all stable code changes from development branch(es) to your ‘master’ branch, i.e. the branch that you will push to the sync staging area. A good rule of thumb is any recent code changes/new features/subroutines/bug fixes/etc... that you are using in current runs to obtain research results should be included in your ‘master’ branch.
• These changes will eventually make it to the central repo, so try to keep it clean, i.e. remove any unnecessary code commenting, preprocessor directives, debugging print statements, etc...
• If you haven’t done so already, now would be a good time to create input parameters for all your new features, values used in calculations, etc... These are setting that you use to run your specific cases. Remember to also set default values for your stuff so that others are not unknowingly using your parameters for their cases.

Let me know what day you will do the merge and I will plan to be at UTIAS to help you work through it and answer any questions that may arise.

Thanks for your cooperation,

<Gatekeeper>