adds some notes

basics.html

@@ -618,7 +618,9 @@
 
             notes:
             - collaboration needs remote repositories
-            - by-product of remotes is backup
+            - by-product of remotes is backup: my `~/projects` does not need to
+              be backed up because **every** project is under version control
+              and has a remote
           </section>
 
           <section id="distributed-remotes" data-markdown>
@@ -757,6 +759,8 @@
             notes:
             - hopefully conflicting changes
             - MR status should show that (can not be merged without conflicts)
+            - TODO explain merge or rebase
+            - TODO show both variants from maintainer and contributor
           </section>
         </section>