removes mostly outdated notes

the remaining ones have been added to basics and paper

basics.html

@@ -824,6 +824,18 @@
               - git commands modify the graph
           </section>
 
+          <section id="branch-when-to-use" data-markdown>
+            ## when to use branches
+
+            - breaking **master**
+            - something takes longer
+            - frequent interruptions
+            - comment out code
+
+            notes:
+            - if logical commit without breaking don't branch
+          </section>
+
           <section id="branch-commands" data-markdown>
             ## branch commands
 

notes.md

-Basics
-======
-
-VCS für mich
-------------
-
-### config
-
-### init
-
-### add
-
-git add foo bar
-
-### commit
-
-git commit -m 'foo bar'
-
-prima -
-
-was hat sich nu verändert?
---------------------------
-
-### log
-
---stat
-
--p
-
-### diff
-
-- was ändern
-- git diff
-- git commit -am
-
-### repo / stage / working
-
-- grafik raussuchen
-- wofür nutzen
-
-### add / reset / checkout
-
-diff und diff --staged und diff HEAD
-
-vcs mit backup
---------------
-
-- github neues projekt --> projekteinbindung: clone / remote add origin foo
-- push
-- pull
-
-
-
-## merge
-
-mergetool linux = meld
-mac = ???
-windows = ???
-
-Workflows
-=========
-
-branching workflows
--------------------
-
-was sind branches und wofür brauch ich sie? diese frage sollte eindeutig in diesem kapitel erklärt
-werden.
-
-### nvie successful git branching model
-
-### multi master
-
-paper with many journals
-
-same paper text  -  different theme file for page layout, graph layout, etc.
-
-## tips for papers
-
-git diff -w --ignore-blank-lines --word-diff
-
-Your Projects
-=============
-
-
-
-
-##### STuff
-
-- explain all collaboration workflows via github
-
-
-- 

paper.md

+## branching model
+
+### multi master
+
+- paper with many journals, different paper text
+- one branch per journal
+- carefully **cherry-pick** additions to all masters
+
+### trunk based development
+
+- same paper text
+- different themes for journals
+- journal-themes via sub-module --> make them reusable
+
+## helpful commands
+
+Better diff command for text:
+
+```bash
+git diff -w --ignore-blank-lines --word-diff
+```