Revealification up to the end of the "The Shallows" section

This commit is contained in:
Éibhear Ó hAnluain 2022-09-23 09:24:19 +01:00
parent a6a46a37a7
commit 5022169c08
Signed by: eibhear
GPG key ID: D124FE9CF2177106
2 changed files with 24 additions and 34 deletions

View file

@ -180,34 +180,24 @@
#+REVEAL_HTML: </div>
** Merging approaches: Rebase
*** Rebase :B_block:BMCOL:
:PROPERTIES:
:BEAMER_env: block
:BEAMER_col: 0.55
:END:
file:./fast-forward-completed-state.png
*** Rebase :BMCOL:
:PROPERTIES:
:BEAMER_col: 0.25
:END:
** Merging approaches: Rebase
*** Rebase :B_block:BMCOL:
:PROPERTIES:
:BEAMER_env: block
:BEAMER_col: 0.55
:END:
file:./fast-forward-completed-state.png
*** Rebase :BMCOL:
:PROPERTIES:
:BEAMER_col: 0.25
:END:
file:./rebase-completed-state.png
#+REVEAL_HTML: <div class="gridded_frame_with_columns">
#+REVEAL_HTML: <div class="one_of_2_columns">
#+ATTR_HTML: :width 70%
file:./images/fast-forward-completed-state.png
#+REVEAL_HTML: </div>
#+REVEAL_HTML: <div class="one_of_2_columns">
#+ATTR_REVEAL: :frag t
#+ATTR_HTML: :width 40%
file:./images/rebase-completed-state.png
#+REVEAL_HTML: </div>
#+REVEAL_HTML: </div>
** Merging appraoches: Decision tree
*** Fast-forward/merge/rebase decision tree :BMCOL:
:PROPERTIES:
:BEAMER_col: 1.0
:END:
file:./merge-decision-tree-chart.png
file:./images/merge-decision-tree-chart.png
* The Shallows
**
*** A little deeper :B_block:BMCOL:
@ -215,7 +205,7 @@
:BEAMER_col: 0.9
:BEAMER_env: block
:END:
file:./Naufragio_por_Gustavo_Gerdel.jpg
file:./images/Naufragio_por_Gustavo_Gerdel.jpg
#+latex: {\tiny
By Ggerdel - Foto de: Gustavo Gerdel (BAB Buceo) [CC BY-SA 4.0 (https://creativecommons.org/licenses/by-sa/4.0)], via Wikimedia Commons
@ -330,7 +320,7 @@
:BEAMER_col: 0.9
:BEAMER_env: block
:END:
file:./Loligo_vulgaris.jpg
file:./images/Loligo_vulgaris.jpg
#+latex: {\tiny
By © Hans Hillewaert, CC BY-SA 4.0, https://commons.wikimedia.org/w/index.php?curid=385705
@ -432,7 +422,7 @@
:BEAMER_col: 0.7
:BEAMER_env: block
:END:
file:./Alvinella_pompejana01.jpg
file:./images/Alvinella_pompejana01.jpg
#+latex: {\tiny
By National Science Foundation (University of Delaware College of Marine Studies) - http://www.nsf.gov/od/lpa/news/press/01/pr0190.htm, Public Domain, https://commons.wikimedia.org/w/index.php?curid=7123122
@ -697,7 +687,7 @@
#+END_SRC
#+RESULTS: fast-forward-initial-state-chart
[[file:./fast-forward-initial-state.png]]
[[file:./images/fast-forward-initial-state.png]]
*** Flow legend
#+name: ff-initial-legend
@ -748,7 +738,7 @@
#+END_SRC
#+RESULTS: fast-forward-completed-state-chart
[[file:./fast-forward-completed-state.png]]
[[file:./images/fast-forward-completed-state.png]]
*** Flow legend
#+name: ff-completed-legend
@ -799,7 +789,7 @@
#+END_SRC
#+RESULTS: two-branch-completed-state-chart
[[file:./two-branch-completed-state.png]]
[[file:./images/two-branch-completed-state.png]]
*** Flow legend
#+name: two-branch-completed-legend
@ -853,7 +843,7 @@
#+END_SRC
#+RESULTS: rebase-completed-state-chart
[[file:./rebase-completed-state.png]]
[[file:./images/rebase-completed-state.png]]
*** Flow legend
#+name: rebase-completed-legend

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB