Commit b7b70397 authored by LotteR93's avatar LotteR93
Browse files

Presentation slides for workshop

parent a179c3bc
\documentclass{beamer}
\setbeamertemplate{navigation symbols}{}
\usetheme{Montpellier}
\centering
\usepackage{listings}
\lstset{
language=bash,
basicstyle=\ttfamily
}
\setbeamertemplate{headline}{}
\beamersetuncovermixins{\opaqueness<1>{25}}{\opaqueness<2->{15}}
\author{Jens Wehner, Simon Kronberg, Lotte Romijn}
\begin{document}
\title{Basics of Git: Organizing and backing up your code and files}
\date{31 October, 2019}
\begin{frame}
\titlepage
\end{frame}
%\begin{frame}\frametitle{Table of contents}\tableofcontents
%\end{frame}
\section{Recap}
\begin{frame}
\frametitle{Recap of colloquium}
\begin{itemize}
\item Problems we're facing: \color{blue}Memory, Distribution, Merging, Backup data, Documentation, Archiving \color{black}
\item Solution: Git
\item Store your files in remote and local repositories
\item Every TU/e employee has GitLab account
\end{itemize}
\includegraphics[width=0.5\textwidth]{Figs/halloween.jpg}
\end{frame}
\begin{frame}
\frametitle{Vocabulary}
\begin{itemize}
\item \textbf{Repository}: Tracks all changes made to files in your project
\item \textbf{Commit}: Save your changes to the local repository
\item \textbf{Push}: Upload local repository content to a remote repository
\item \textbf{Pull}: Update the local version of a repository from a remote
\item \textbf{Branch}: Reference to a single commit to isolate separate lines of development
\item \textbf{Merge}: Integrate separate lines of development back together
\end{itemize}
\end{frame}
\section{Plan for today}
\begin{frame}
\frametitle{Plan for today: 14:00-15:20}
Download SmartGit: \url{https://www.syntevo.com/smartgit/}
\begin{itemize}
\item Log on to GitLab
\item Make project
\item Clone project in local folder and add file
\item Commit file with commit message
\item Push to remote on GitLab
\item EXTRA: Repeat above for a second file, perform multiple commits, unstage commits, reset, checkout, etc.
\end{itemize}
\end{frame}
\begin{frame}
\Huge \centering BREAK
\end{frame}
\begin{frame}
\frametitle{Plan for today: 15:45-17:00}
\begin{itemize}
\item Create a new branch
\item Switch branches and commit changes
\item Merge changes
\item Create merge conflict and resolve
\item EXTRA: Repeat in a GitLab group project
\end{itemize}
\includegraphics[width=0.9\textwidth]{Figs/gitbranches_votca.png}
\end{frame}
\end{document}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment