summaryrefslogtreecommitdiffstats
path: root/workshop.tex
diff options
context:
space:
mode:
Diffstat (limited to 'workshop.tex')
-rw-r--r--workshop.tex28
1 files changed, 28 insertions, 0 deletions
diff --git a/workshop.tex b/workshop.tex
index b404490..c798a16 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -25,4 +25,32 @@
...
\end{frame}
+\begin{frame}
+\begin{center}
+\includegraphics[scale=.9]{figures/overview.pdf}
+\end{center}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-push.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-pull.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-pull-2.pdf}
+\end{frame}
+
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/git-merge-ok.pdf}
+\end{frame}
+
+\begin{frame}
+\begin{center}
+\includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
+\end{center}
+\end{frame}
+
\end{document}