\documentclass[14pt]{beamer} \usepackage[utf8x]{inputenc} \usepackage[T1]{fontenc} \usepackage{hyperref} \usepackage{algorithmic} \usepackage{algorithm} \usepackage{graphicx} \usepackage{helvet} %\setbeamercovered{transparent} \usetheme{Boadilla} \usecolortheme{beaver} \setbeamercovered{transparent} \AtBeginSection[] { \begin{frame} \frametitle{Outline} \tableofcontents[currentsection] \end{frame} } \author[SC \& TH]{Thibaut Horel \and Stéphane Caron} \institute{Technicolor, Palo Alto} \date{\today} \title[Git workshop]{A Git approach to collaborative work in research} \begin{document} \begin{frame} \titlepage \end{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} \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} \includegraphics[width=\textwidth]{figures/commits.pdf} \end{frame} \begin{frame} \begin{center} \includegraphics[scale=.9]{figures/git-merge-conflict.pdf} \end{center} \end{frame} \end{document}