Start feature branch workflow

Author: alexstaeding

chapters/workflows/centralized.tex

@@ -341,3 +341,23 @@ \subsection{Rebase vs Merge}\label{subsec:rebase-vs-merge}
     \Large
     \bashcommand{git config --global pull.ff only}
 \end{frame}
+
+\subsection{Final Review}\label{subsec:final-review}
+\begin{frame}[c]
+    \slidehead
+    \centering
+    \Large
+    \textbf{Final Review}
+\end{frame}
+
+\begin{frame}[c]
+    \slidehead
+    \large
+    \textbf{Bewertungskriterien}
+    \normalsize
+    \begin{enumerate}
+        \item<2-> Wie skaliert der Workflow? \only<3->{\hfill\textbf{nicht gut}}
+        \item<4-> Kann man Fehler einfach rückgängig machen? \only<5->{\hfill\textbf{geht}}
+        \item<6-> Erzeugt dieser Workflow eine neue unnötige, kognitive Überlastung für das Team? \only<7->{\hfill\textbf{nein}}
+    \end{enumerate}
+\end{frame}

chapters/workflows/feature-branch.tex

@@ -4,3 +4,36 @@ \subsection{Feature Branch Workflow}\label{subsec:feature-branch-workflow}
     \Large
     \textbf{Feature Branch Workflow}
 \end{frame}
+
+\begin{frame}[c]
+    \slidehead
+    \centering
+    \begin{tikzpicture}
+        \node[tiny-commit] at (0, 0)(a){};
+        \node[tiny-commit] at (2, 0) (b){};
+        \node[tiny-commit] at (4, 0) (c){};
+        \node<2-5>[tiny-commit, fill=TUDa-8a] at (6, -1) (feature/a/1){};
+        \node<3-6>[tiny-commit, fill=TUDa-10a] at (6, -2) (feature/b/1){};
+        \node<4->[tiny-commit] at (6, 0) (d){};
+        \node<5->[tiny-commit, fill=TUDa-8a!50] at (8, 0) (e){};
+        \node<7>[tiny-commit, fill=TUDa-10a] at (10, -2) (feature/b/1){};
+        \node<8>[tiny-commit, fill=TUDa-10a!50] at (10, 0) (f){};
+        \node[branch] at (13, 0) (master){master};
+        \node<2-5>[branch] at (13, -1) (feature/a){feature/a};
+        \node<3-7>[branch] at (13, -2) (feature/b){feature/b};
+        \draw[parent] (b) to (a);
+        \draw[parent] (c) to (b);
+        \draw<2-5>[parent] (feature/a/1) to (c);
+        \draw<3-6>[parent] (feature/b/1) to (c);
+        \draw<7>[parent] (feature/b/1) to (e);
+        \draw<4->[parent] (d) to (c);
+        \draw<5->[parent] (e) to (d);
+        \draw<8>[parent] (f) to (e);
+        \draw<-3>[ref-arc] (master) to (c);
+        \draw<4>[ref-arc] (master) to (d);
+        \draw<5-7>[ref-arc] (master) to (e);
+        \draw<8>[ref-arc] (master) to (f);
+        \draw<2-5>[ref-arc] (feature/a) to (feature/a/1);
+        \draw<3-7>[ref-arc] (feature/b) to (feature/b/1);
+    \end{tikzpicture}
+\end{frame}

common/packages.tex

@@ -37,8 +37,8 @@
     tiny-commit/.style={
         circle,
         fill=TUDa-1a,
-        minimum width=3em,
-        minimum height=3em,
+        minimum width=2.2em,
+        minimum height=2.2em,
         very thick,
         draw=black!70,
     },

workshops/workflows.tex

@@ -64,8 +64,8 @@
         \end{description}
     \end{frame}
 
-    \subimport{../chapters/workflows}{intro}
-    \subimport{../chapters/workflows}{centralized}
+%    \subimport{../chapters/workflows}{intro}
+%    \subimport{../chapters/workflows}{centralized}
     \subimport{../chapters/workflows}{feature-branch}