summaryrefslogtreecommitdiffstats
path: root/workshop.tex
diff options
context:
space:
mode:
authorThibaut <thibaut@horel.org>2012-05-29 18:38:54 -0700
committerThibaut <thibaut@horel.org>2012-05-29 18:38:54 -0700
commitc4dc20f3a38ba06f48d16e49ee9c8b63b4134658 (patch)
tree5c1fbfc93a18320f4c496864101e7699025e13fc /workshop.tex
parent28b50fb1c6559e0c81b1b87f1c619c8edc144b01 (diff)
downloadgit_workshop-c4dc20f3a38ba06f48d16e49ee9c8b63b4134658.tar.gz
Some more shit
Diffstat (limited to 'workshop.tex')
-rw-r--r--workshop.tex13
1 files changed, 12 insertions, 1 deletions
diff --git a/workshop.tex b/workshop.tex
index 8b4a563..922fd8b 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -50,7 +50,18 @@ Examples:
\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
+\item Dropbox: \visible<3->{Good for file sharing, terrible at handling concurrency}
+\end{itemize}
+\end{frame}
+
+\begin{frame}{Version Control Systems}
+\begin{itemize}
+\item designed exactly for this purpose
+\item several flavors:
+\begin{itemize}
+\item centralized (ex: Subversion)
+\item decentralized (ex: Git)
+\end{itemize}
\end{itemize}
\end{frame}