big update on collab

.gitignore

+img/git-remote-contributor.svg
+img/git-remote-maintainer.svg
+img/git-remote-solo.svg
+img/license-chooser.svg
 img/motivation-throwaway-playground.svg
+img/staging-area.svg

basics.html

@@ -363,6 +363,9 @@
             git config --global alias.lol \
               'log --graph --decorate --oneline --all'
             ```
+
+            notes:
+            - editor: talk about line endings
           </section>
         </section>
 
@@ -672,6 +675,12 @@
 
             notes:
             - use wip/feature as branch name, see motivation playground
+            - use git lol frequently to showcase its importance
+            - make changes in playground
+            - git push
+            - make changes in master
+            - git lol
+            - make changes in playground
           </section>
 
           <section id="merging" data-markdown>
@@ -687,13 +696,7 @@
             ```
 
             notes:
-            - make changes in playground
-            - git push
-            - make changes in master
-            - git lol
-            - make changes in playground
-            - merge
-            - git lol
+            - use git lol to show final layout
           </section>
         </section>
 
@@ -706,25 +709,54 @@
             # collaboration
 
             notes:
-            - TODO talk about line endings
+            - we: create new repo
+            - group: fork and clone, remote add upstream, lol
+            - next slide, explain img
           </section>
 
-          <section id="collab-" data-markdown>
-            ## command line
-            ### git 
+          <section id="collab-contributor" data-markdown>
+            ## view of contributor
 
-            ```bash
-            
-            ```
+            ![remotes](img/git-remote-contributor.svg)
+
+            notes:
+            - we: new commit
+            - group: fetch, lol, pull upstream master, lol
+            - group: push origin, lol
+            - group: commit, push, MR (master or wip?)
+            - collaboration happens in issues and MR discussion!
+            - we: review and possible resolve merge request in GL
+            - show next slide once merging is done on command line
           </section>
 
-          <section id="collab-" data-markdown>
-            ## command line
-            ### git 
+          <section id="collab-maintainer" data-markdown>
+            ## view of maintainer
 
-            ```bash
-            
-            ```
+            ![remotes](img/git-remote-maintainer.svg)
+
+            notes:
+            - we: review one MR, show line comments in GL, thumbs up
+          </section>
+
+          <section id="collab-review" data-markdown>
+            ## review
+
+            code of conduct:
+
+            - be friendly
+            - be responsible
+            - be open
+            - be creative
+            - be proactive
+            - have fun
+          </section>
+
+          <section id="collab-conflicts" data-markdown>
+            ## conflicts
+
+            notes:
+            - hopefully conflicting changes
+            - MR status should show that (can not be merged without conflicts)
           </section>
         </section>
 
@@ -761,22 +793,6 @@
               - contribute via merge requests
               - review commits and merge requests
           </section>
-
-          <section id="homework-behavior" data-markdown>
-            ## homework #3
-
-            be friendly
-
-            be responsible
-
-            be open
-
-            be creative
-
-            be proactive
-
-            have fun
-          </section>
         </section>
 
         <section id="eof" data-background="img/trex.png">

img/git-remote-contributor.dot

+digraph {
+    node [shape = "box", style = "filled, rounded"]
+
+    subgraph clusterorigin {
+        label = "origin"
+
+        node [color = orchid]
+
+        omaster[label = "master"]
+    }
+
+    subgraph clusterlocal {
+        label = "local"
+
+        node [color = orchid]
+
+        master[label = "master"]
+    }
+
+    subgraph clusterupstream {
+        label = "upstream"
+
+        node [color = limegreen]
+
+        umaster[label = "master"]
+    }
+
+    omaster -> master [label = "git pull"]
+    master -> omaster [label = "git push", constraint = false]
+    umaster -> master [label = "git pull upstream master", constraint = false]
+    omaster -> umaster [label = "pull request (GitHub)\nmerge request (GitLab)", constraint = false]
+}

img/git-remote-maintainer.dot

+digraph {
+    node [shape = "box", style = "filled, rounded"]
+
+    subgraph clusterorigin {
+        label = "origin"
+
+        node [color = orchid]
+
+        omaster[label = "master"]
+    }
+
+    subgraph clusterlocal {
+        label = "local"
+
+        node [color = orchid]
+
+        master[label = "master"]
+    }
+
+    subgraph clusteralice {
+        label = "alice"
+
+        node [color = limegreen]
+
+        amaster[label = "master"]
+    }
+
+    subgraph clusterbob {
+        label = "bob"
+
+        node [color = lightskyblue]
+
+        bmaster[label = "master"]
+    }
+
+    omaster -> master [label = "git pull"]
+    master -> omaster [label = "git push", constraint = false]
+    amaster -> master [label = "git pull alice", constraint = false]
+    bmaster -> master [label = "git pull bob", constraint = false]
+}