Update Git_workflow_exercises.md

OK? Ready for exercises?

Author: DanteDT

Diff for: docs/guides/Git_workflow_exercises.md

@@ -1,6 +1,6 @@
 ### GitHub workflows
 
-To get setup as a PhUSE CS contributor, see [Contributor_setup.md](https://github.com/phuse-org/phuse-scripts/blob/master/docs/guides/Contributor_Setup.md)
+To get setup as a PhUSE CS collaborator, see [Contributor_setup.md](https://github.com/phuse-org/phuse-scripts/blob/master/docs/guides/Contributor_Setup.md)
 
 ### Objective
 
@@ -10,42 +10,37 @@ Script GitHub workflow exercises for CSS 2016.
 
 [GitHub article on Repository Permission Levels](http://help.github.com/articles/repository-permission-levels-for-an-organization/)
 
-  1. phuse-or/phuse-scripts Maintainers: can change master code
-  2. GitHub Contributors: can create "pull request" from their own branch, for the Maintainers to review
+  1. Write-Access Collaborators (int): can create/modify "master" files
+  2. Read-Access Collaborators (ext):  can send "pull requests" from their own "forks", for the Write-Access team to assess
 
-Relevant roles for phuse-org/phuse-scripts?
-  1. Admin (manage repository settings, NOT relevant for workshop)
-  2. Maintainer (write access)
-  3. Contributors (no write access)? [our repo teams](https://github.com/phuse-org/phuse-scripts/settings/collaboration)
+#### Setup for the phuse-org/phuse-scripts repository
 
-#### phuse-or/phuse-scripts Setup
-
-  * Master branch is always "production ready"
-  * Therefore relatively few "Maintainers", who
-    * have "write access", and can therefore
-    * review "pull requests" and commit changes to master branch
+  * Master branch is always "ready to deploy"
+  * Therefore relatively few "Write-Access" members, who can
+    * create/modify files directly, and
+    * review "pull requests", merge them into the "master"
   * Any GitHub member can 
     * "fork" the phuse-scripts repository
-    * develop new scripts or enhance any element
-    * create a "pull request", a proposal to incorporate your modifications into the phuse-scripts repository
+    * create/modify files in their "fork"
+    * send a "pull request" back to the origin repo (phuse-scripts)
 
-#### GitHub Exercises PSch: Are we creating some 'sandbox for this? What files to we use for examples? 
+#### GitHub Exercises
 
-  * Simple steps: Contributor suggests a change to an UNmodified file on the master branch
-    1. Contributor:
+  * Simple scenario: Collaborator suggests a change to an UNmodified file on "master"
+    1. EXT. Collaborator:
       * ... forks the phuse-scripts repository
       * ... [or re-SYNC existing, out-of-sync fork]
       * ... creates/modifies file in your new fork
       * ... creates "pull request" in the fork
         * this redirects you to the source repo (note path in page header)
         * request pull _from_ your fork, _to_ the original repo
-        * ... demo & track locations
-    2. Maintainers:
-      * ... receives GitHub notification of "pull request" [CLARIFY!]
-      * ... reviews the pull request, changes
-      * ... [DISCUSS WITH CONTRIBUTOR!]
-      * ... approve / reject
-    3. Contributor:
+        * (demo of discussing and resolving a pull request)
+    2. INT. Collaborator:
+      * ... receives GitHub notification of "pull request" _(depends on user settings)_
+      * ... reviews the pull request
+      * ... discusses with ext. collaborator
+      * ... approves / rejects
+    3. EXT. Collaborator:
       * Option to delete fork
       * [RESYNC with latest changes from original repo]
 
@@ -56,7 +51,20 @@ Relevant roles for phuse-org/phuse-scripts?
     4. resolve any conflicts
     5. "pull request" ... screenshots
     6. Now as above?
+
+    1. EXT. Collaborator:
+      * ... Re-syncs with origin repo, so always working with up-to-date files. [Re-syncing requires command line](https://help.github.com/articles/syncing-a-fork/)
+      * ... develops a new feature, extensive changes in own fork
+      * ... creates "pull request" in the fork
+    2. INT. Collaborator:
+      * ... receives GitHub notification of "pull request" _(depends on user settings)_
+      * ... reviews the pull request
+      * ... discusses with contributor
+        * (will advise EXT. to re-sync & try again, if it's clear s/he has not first pulled latest changes!)
+      * ... approves / rejects
+
   * Contributing without GitHub access
+    * Via PhUSE Wiki, email to project leads
 
 ### Git workflow tutorials