FSU Scientific Computing Github Tutorial

A repository to practice using git/github

Steps to contribute

1. Fork this repository
2. Clone the forked repo to your local machine
3. Create a new remote named upstream that points to the primary repository (the one you forked)
4. Create a branch for the edit or feature
5. Move to the feature branch and edit away making many commits
6. Once you are done and commited all of your edits open a pull request on github to merge your branch into master.
7. Continue to push to the feature branch to address any issues brought up in the pull request discussion.
8. Hopefully the pull request eventually gets merged
9. After your feature has been merged try moving back to master and running the command

git fetch upstream
git rebase upstream/master

If all has gone well your feature will be show in the master branch!

This is the basis for the "GitHub Workflow".

For more information see Understanding the GitHub flow.