Everything except the practice partHEADmaster

1 files changed, 46 insertions, 4 deletions

diff --git a/workshop.tex b/workshop.tex
index b3491cb..f661c35 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -49,14 +49,16 @@ Examples:
 
 \begin{frame}{Bad solutions}
 \begin{itemize}
-\item Email attachments: \visible<2->{nobody in their right mind wants to do that}
-\item Dropbox: \visible<3->{Good for file sharing, terrible at handling concurrency}
+\item Email attachments\visible<2->{: nobody in their right mind wants to do that}
+\vspace{2em}
+\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
+\vspace{2em}
 \item several flavors:
 \begin{itemize}
 \item centralized (ex: Subversion)
@@ -70,13 +72,53 @@ Examples:
 \end{frame}
 
 \begin{frame}{Local vs. distant history}
-Evrything can be done locally:
+Everything can be done locally:
 \begin{center}
 \includegraphics[scale=.9]{figures/overview.pdf}
 \end{center}
 \end{frame}
 
-\begin{frame}
+\begin{frame}{Initialising}
+Existing repository:
+
+\begin{block}{}
+{\tt \$ git clone <user>@palosgit01:/git/<project>}
+\end{block}
+
+\vspace{2em}
+
+Non-existing repository:
+\begin{itemize}
+\item Ask Umar to create a project for your team
+\item Repeat previous step
+\end{itemize}
+\end{frame}
+
+\begin{frame}{Local editing}
+\begin{itemize}
+\item Edit a few files
+\vspace{2em}
+\item When you are happy with the state of the project:
+\begin{block}{}
+{\tt \$ git commit -a -m "Proof of the uniqueness theorem"}
+\end{block}
+\end{itemize}
+\end{frame}
+
+\begin{frame}{File tracking}
+
+\begin{itemize}
+\item By default Git does not track new files
+\item Adding a new file:
+\begin{block}{}
+{\tt \$ git add <filename>}
+\end{block}
+\end{itemize}
+\vspace{2em}
+Which file should you add to the project?
+\end{frame}
+
+\begin{frame}{Synchronizing with other people}
 \includegraphics[width=\textwidth]{figures/git-push.pdf}
 \end{frame}