The new example uses a fictive feature-branch to don't introduce the
"bad" (i.e. we don't want to encourage it)  habit of pushing to main.

Co-authored-by: Tobias Koelling <tobias.koelling@mpimet.mpg.de>

Co-authored-by: Tobias Koelling <tobias.koelling@mpimet.mpg.de>

* Add mermaid graphs to illustrate different branching schemes
* Move rebasing to backup slides
* Make the conflict example more verbose

Georgiana Mania authored 1 year ago and Lukas Kluft committed 1 year ago

@k202174 and @m300575