69 lines
2.4 KiB
TeX
69 lines
2.4 KiB
TeX
\begin{frame}
|
|
\frametitle{And the miracle happens}
|
|
\framesubtitle{Branches}
|
|
\section{Branches}
|
|
|
|
\begin{center}
|
|
\includegraphics[width=0.5\textwidth]{assets/branches.jpg}
|
|
\end{center}
|
|
|
|
\end{frame}
|
|
|
|
\begin{frame}
|
|
\frametitle{And the miracle happens}
|
|
\framesubtitle{What does it look like in practice?}
|
|
|
|
\begin{tikzpicture}[
|
|
commit/.style={circle, draw, fill=orange!80, minimum size=6mm, font=\tiny\bfseries},
|
|
commitA/.style={circle, draw, fill=teal!60, minimum size=6mm, font=\tiny\bfseries},
|
|
commitB/.style={circle, draw, fill=violet!60, minimum size=6mm, font=\tiny\bfseries},
|
|
branch/.style={rounded corners, fill=gray!20, draw=gray, font=\tiny\ttfamily, inner sep=3pt},
|
|
branchA/.style={rounded corners, fill=teal!15, draw=teal, font=\tiny\ttfamily, inner sep=3pt},
|
|
branchB/.style={rounded corners, fill=violet!15, draw=violet, font=\tiny\ttfamily, inner sep=3pt},
|
|
merge/.style={circle, draw, fill=orange!80, minimum size=6mm, font=\tiny\bfseries},
|
|
arrow/.style={-{Stealth[length=2mm]}, thick, gray},
|
|
arrowA/.style={-{Stealth[length=2mm]}, thick, teal!70},
|
|
arrowB/.style={-{Stealth[length=2mm]}, thick, violet!70},
|
|
label/.style={font=\small\bfseries, text=gray!70},
|
|
node distance=1.5cm
|
|
]
|
|
|
|
% === Master branch ===
|
|
\node[commit] (c1) {C1};
|
|
\node[commit, right=of c1] (c2) {C2};
|
|
\node[merge, right=3.5cm of c2] (c5) {C5};
|
|
\node[merge, right=3.5cm of c5] (c8) {C8};
|
|
|
|
\draw[arrow] (c1) -- (c2);
|
|
\draw[arrow] (c2) -- (c5);
|
|
\draw[arrow] (c5) -- (c8);
|
|
|
|
\node[branch, above=0.4cm of c8] (master) {master};
|
|
\draw[-{Stealth}, thin] (master) -- (c8);
|
|
|
|
% === Alice's branch (upward) ===
|
|
\node[commitA, above right=0.8cm and 1cm of c2] (a1) {C3};
|
|
\node[commitA, right=of a1] (a2) {C4};
|
|
|
|
\draw[arrowA] (c2) -- (a1);
|
|
\draw[arrowA] (a1) -- (a2);
|
|
\draw[arrowA] (a2) -- (c5);
|
|
|
|
\node[branchA, above=0.4cm of a2] (ba) {alice-branch};
|
|
\draw[-{Stealth}, thin, teal] (ba) -- (a2);
|
|
\node[label, text=teal!70] at (-1.5, 0.8) {Alice};
|
|
|
|
% === Bob's branch (downward) ===
|
|
\node[commitB, below right=0.8cm and 1cm of c5] (b1) {C6};
|
|
\node[commitB, right=of b1] (b2) {C7};
|
|
|
|
\draw[arrowB] (c5) -- (b1);
|
|
\draw[arrowB] (b1) -- (b2);
|
|
\draw[arrowB] (b2) -- (c8);
|
|
|
|
\node[branchB, below=0.4cm of b2] (bb) {bob-branch};
|
|
\draw[-{Stealth}, thin, violet] (bb) -- (b2);
|
|
\node[label, text=violet!70] at (-1.5, -0.8) {Bob};
|
|
|
|
\end{tikzpicture}
|
|
\end{frame} |