62 lines
2.3 KiB
TeX
62 lines
2.3 KiB
TeX
\begin{frame}
|
|
\frametitle{What happens when working in a group}
|
|
\begin{tikzpicture}[
|
|
commit/.style={circle, draw, fill=orange!80, minimum size=6mm, font=\tiny\bfseries},
|
|
conflict/.style={circle, draw, fill=red!70, minimum size=6mm, font=\tiny\bfseries},
|
|
branch/.style={rounded corners, fill=gray!20, draw=gray, font=\tiny\ttfamily, inner sep=3pt},
|
|
head/.style={rounded corners, fill=cyan!20, draw=cyan!60, font=\tiny\ttfamily, inner sep=3pt},
|
|
label/.style={font=\small\bfseries, text=gray!70},
|
|
arrow/.style={-{Stealth[length=2mm]}, thick, gray},
|
|
node distance=1.2cm
|
|
]
|
|
|
|
% === PC 1 (Alice) ===
|
|
\node[label] at (-1.8, 0) {Alice};
|
|
\node[commit] (a1) at (0,0) {C1};
|
|
\node[commit, right=of a1] (a2) {C2};
|
|
\node[commit, right=of a2] (a3) {C3};
|
|
\node[commit, right=of a3] (a4) {C4};
|
|
\node[commit, right=of a4] (a5) {C5};
|
|
\draw[arrow] (a1) -- (a2);
|
|
\draw[arrow] (a2) -- (a3);
|
|
\draw[arrow] (a3) -- (a4);
|
|
\draw[arrow] (a4) -- (a5);
|
|
\node[branch, above=0.4cm of a5] (m1) {master};
|
|
\draw[-{Stealth}, thin] (m1) -- (a5);
|
|
|
|
% === PC 2 (Bob) - conflit ===
|
|
\node[label] at (-1.8, -2.2) {Bob};
|
|
\node[commit] (b1) at (0,-2.2) {C1};
|
|
\node[commit, right=of b1] (b2) {C2};
|
|
\node[commit, right=of b2] (b3) {C3};
|
|
\node[commit, right=of b3] (b6) {C6};
|
|
\node[conflict, right=of b6] (bx) {!!};
|
|
\draw[arrow] (b1) -- (b2);
|
|
\draw[arrow] (b2) -- (b3);
|
|
\draw[arrow] (b3) -- (b6);
|
|
\draw[arrow, red!70] (b6) -- (bx);
|
|
\node[branch, above=0.4cm of b6] (m2) {master};
|
|
\draw[-{Stealth}, thin] (m2) -- (b6);
|
|
\node[font=\tiny\color{red!70}, right=0.3cm of bx] {CONFLICT on push!};
|
|
|
|
% === PC 3 (Charlie) - conflit ===
|
|
\node[label] at (-1.8, -4.4) {Charlie};
|
|
\node[commit] (d1) at (0,-4.4) {C1};
|
|
\node[commit, right=of d1] (d2) {C2};
|
|
\node[commit, right=of d2] (d7) {C7};
|
|
\node[commit, right=of d7] (d8) {C8};
|
|
\node[conflict, right=of d8] (dx) {!!};
|
|
\draw[arrow] (d1) -- (d2);
|
|
\draw[arrow] (d2) -- (d7);
|
|
\draw[arrow] (d7) -- (d8);
|
|
\draw[arrow, red!70] (d8) -- (dx);
|
|
\node[branch, above=0.4cm of d8] (m3) {master};
|
|
\draw[-{Stealth}, thin] (m3) -- (d8);
|
|
\node[font=\tiny\color{red!70}, right=0.3cm of dx] {CONFLICT on push!};
|
|
|
|
% Dashed lines to show the remote link
|
|
\draw[dashed, gray!40, thick] (a3.south) -- (b3.north);
|
|
\draw[dashed, gray!40, thick] (a2.south) -- (d2.north);
|
|
|
|
\end{tikzpicture}
|
|
\end{frame} |