Jetstream+Merge+step-by-step+GIT+commands

The following steps describe the pull/merge/push procedure to be performed on Scinet by each member of the current merge group:
 * 1) Commit any pending changes to your master branch before beginning the merge process:
 * git checkout master
 * git commit -a
 * 1) Create a branch for merging:
 * git branch merging
 * 1) Switch to merge branch so that your local master branch is not affected during merge:
 * git checkout merginggit
 * 1) Pull from the Jetstream sync staging area:
 * git pull /home/z/zingg/treist/jetstream_sync_staging_
 * 1) Resolve conflicts
 * 2) Ensure that all compiling issues are resolved before pushing back to the sync staging area. Execute the following script to compile Jetstream:
 * ./make_jetstream
 * 1) Confirm that executable has been successfully compiled...check the time stamp on the executable:
 * ls -l ~/bin/jetstream_x86_64
 * 1) Push back to the Jetstream sync staging area:
 * git commit -a
 * git push /home/z/zingg/treist/jetstream_sync_staging_ merging:master
 * 1) <span style="background-color: transparent; color: #000000; font-family: Arial; font-size: 15px; text-decoration: none; vertical-align: baseline;">Set some write permissions in the sync staging area:
 * chmod g+w /home/z/zingg/treist/jetstream_sync_staging_ /objects/*

<span style="background-color: transparent; color: #000000; font-family: Arial; font-size: 15px; text-decoration: none; vertical-align: baseline;">Member 2, then member 3, then member 4 (in sequence) repeat the pull/merge/push steps described above.

<span style="background-color: transparent; color: #000000; font-family: Arial; font-size: 15px; text-decoration: none; vertical-align: baseline;">Click here to return to the description of the Jetstream Code Syncronization procedure.