Merge branch 'master' of horel.org:thibaut/git_workshop

1 files changed, 35 insertions, 6 deletions

diff --git a/workshop.tex b/workshop.tex
index d09f850..8b4a563 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -8,12 +8,21 @@
 
 \usepackage{helvet}
 %\setbeamercovered{transparent}
-\usecolortheme{crane}
+\usetheme{Boadilla}
+\usecolortheme{beaver}
+\setbeamercovered{transparent}
+\AtBeginSection[]
+{
+\begin{frame}<beamer>
+\frametitle{Outline}
+\tableofcontents[currentsection]
+\end{frame}
+}
 
-\author[SC \& TH]{Stéphane Caron \and Thibaut Horel}
-\institute{Technicolor Palo Alto}
+\author[SC \& TH]{Thibaut Horel \and Stéphane Caron}
+\institute{Technicolor, Palo Alto}
 \date{\today}
-\title{Git Workshop}
+\title[Git workshop]{A Git approach to collaborative work in research}
 
 \begin{document}
 
@@ -21,8 +30,28 @@
 \titlepage
 \end{frame}
 
-\begin{frame}
-...
+\begin{frame}{Problem}
+\alert{Goal:} 2 or more people want to:
+\begin{itemize}
+\item easily share files
+\item work concurrently on these files
+\item keep track of what everybody is doing
+\end{itemize}
+\pause
+\vspace{2em}
+Examples:
+\begin{itemize}
+\item writing a paper
+\item writing code
+\item \ldots
+\end{itemize}
+\end{frame}
+
+\begin{frame}{Bad solutions}
+\begin{itemize}
+\item Email attachments: \visible<2->{nobody in their right mind wants to do that}
+\item Dropbox: good to share files not to work concurrently
+\end{itemize}
 \end{frame}
 
 \begin{frame}