cleans up collab in day 1 as prep for day 2

basics.html

@@ -38,6 +38,7 @@
             - log in to git.idiv.de
             - cheat sheets are handed out later
             - if you have questions feel free to interrupt
+            - cleanup https://git.idiv.de/sc/edu/git-merge-conflict-demo
           </section>
 
           <section id="intro-objectives" data-markdown>
@@ -939,15 +940,8 @@
             - 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-maintainer" data-markdown>
-            ## view of maintainer
-
-            ![remotes](img/git-remote-maintainer.svg)
-
-            notes:
             - we: review one MR, show line comments in GL, thumbs up
+            - tomorrow: view of maintainer
           </section>
 
           <section id="collab-review-criticism" data-markdown>
@@ -967,44 +961,8 @@
               discussion
           </section>
 
-          <section id="collab-review-code-of-conduct" data-markdown>
-            ## review
-            ### code of conduct
-
-            1.  be friendly
-            1.  be responsible
-            1.  be open
-            1.  be proactive
-
-            notes:
-            - the discussions are usually public, so be aware of that
-            - usually needed when community grows
-            - decide with your community, write `CONTRIBUTING.md`
-          </section>
-
-          <section id="collab-review-your-turn" data-markdown>
-            ## review
-            ### your turn
-
-            1.  review a merge request
-            1.  discuss / emote
-            1.  comment on code
-          </section>
-
-          <section id="collab-conflicts" data-markdown>
+          <section id="collab-conflicts-contributor" data-markdown>
             ## resolving conflicts
-            ### maintainer
-
-            ```bash
-            git remote add alice https://...
-            git fetch alice
-            git switch master
-            git merge alice/topic/feature
-            # fix conflicts
-            git push
-            ```
-
-            ### contributor
 
             ```bash
             git fetch upstream
@@ -1015,17 +973,21 @@
             ```
 
             notes:
-            - hopefully conflicting changes
-            - MR status should show that (can not be merged without conflicts)
-            - maintainer decides if trivial or delegate to contributor
+            - https://git.idiv.de/sc/edu/git-merge-conflict-demo
+            - contains two conflicting branches
+            - git lol
+            - git fetch
+            - explain different solutions
+            - create MR
+            - MR status show merge conflicts
+            - edit file, show how to keep both ours and theirs
           </section>
 
           <section id="summary-3" data-markdown>
             ## you can now
 
             - create and connect to remotes
-            - contribute to projects you do not own
-            - maintain projects you own
+            - contribute to projects
           </section>
 
           <section id="summary-4" data-markdown>
@@ -1120,6 +1082,43 @@
             git push --force
             ```
           </section>
+
+          <section id="collab-maintainer" data-markdown>
+            ## view of maintainer
+
+            ![remotes](img/git-remote-maintainer.svg)
+          </section>
+
+          <section id="collab-review-code-of-conduct" data-markdown>
+            ## review
+            ### code of conduct
+
+            1.  be friendly
+            1.  be responsible
+            1.  be open
+            1.  be proactive
+
+            notes:
+            - the discussions are usually public, so be aware of that
+            - usually needed when community grows
+            - decide with your community, write `CONTRIBUTING.md`
+          </section>
+
+          <section id="collab-conflicts-maintainer" data-markdown>
+            ## resolving conflicts
+
+            ```bash
+            git remote add alice https://...
+            git fetch alice
+            git switch master
+            git merge alice/topic/feature
+            # fix conflicts
+            git push
+            ```
+
+            notes:
+            - maintainer decides if trivial or delegate to contributor
+          </section>
         </section>
       </div>
     </div>