Mar-scal / Assessment_fns

SKY version - SABHU TEAM: Please fork this repo if planning to work on it from network directory. NO EDITS OR BRANCHES ALLOWED!
GNU General Public License v3.0
2 stars 6 forks source link

Assessment_fns

This is the core collection of functions used for the assessment of Offshore Scallop.

To install Git: https://git-scm.com/download/win

Some tips/best practices: https://guides.github.com/introduction/flow/

We have modified the typical GitHub workflow so that we can work from our network and users can access their scripts from a remote VPN connection. Our general idea for a workflow comes from here https://nvie.com/files/Git-branching-model.pdf, with some revisions to work from a network and minimize uncessary duplication.

The workflow is as follows

1: New users should be added as collaborators (talk to Dave or Freya)

2: FORK the Mar-scal MASTER to your personal github account

3: On your computer you will clone your FORK repo to Y:\Github\Offshore\Assessment_fns\YOUR_NAME.

4: All independent work is to be performed on a branch inside your personal FORK that resides in Y:\Github....

5: When you have completed your revisions COMMIT the revisions to your branch

6: Create a PULL REQUEST to merge the data into your FORK.

7: Test your changes to ensure there are no bugs within your FORK

8: You can now submit a PULL REQUEST from your FORK to the Mar-scal MASTER

Collaborators CAN merge their pull requests independently, but complicated edits MUST be discussed before being merged with the master on Mar-scal as these are now immediately implemented on our shared network.