techniques pull

.gitignore

@@ -8,3 +8,4 @@
 *.tex.kate-swp
 *.vrb
 *.backup
+*.autosave

cours_git.tex

@@ -262,11 +262,39 @@
 			\item Dans le cas que la branche remote n'existe pas (elle va être crée): \verb|git push -u origin NAME|
 		\end{itemize}
 	\end{itemize}
-
 \end{frame}
 
 \subsection{Les techniques de pull}
 
+\begin{frame}
+\frametitle{Pull merge (default)}
+	\begin{columns}[T]
+		\column{0.5\textwidth}
+			\begin{center}
+				\includegraphics[height=0.7\textheight]{img/pull_before}
+			\end{center}
+		\column{0.5\textwidth}
+			\begin{center}
+				\includegraphics[height=0.7\textheight]{img/pull_merge}
+			\end{center}
+	\end{columns}
+\end{frame}
+
+\begin{frame}
+\frametitle{Pull rebase}
+	\begin{columns}[T]
+		\column{0.5\textwidth}
+			\begin{center}
+				\includegraphics[height=0.7\textheight]{img/pull_before}
+			\end{center}
+		\column{0.5\textwidth}
+			\begin{center}
+				\includegraphics[height=0.7\textheight]{img/pull_rebase}
+			\end{center}
+	\end{columns}
+\end{frame}
+
+
 \begin{frame}
 \frametitle{}
 \end{frame}