Commit e66b68e4 authored by Remy Huet's avatar Remy Huet

Figures merge et rebase

parent 3cb4f586
Pipeline #33387 passed with stage
in 21 seconds
......@@ -70,27 +70,19 @@
\Pause
\medskip
Concrètement :
\bigskip
TODO figures
\begin{center}
%\includegraphics[height=3em]{imgs/conflit.png}
Merge de la branche bleue dans la branche verte
\end{center}
\medskip
\begin{center}
%\includegraphics[height=4em]{imgs/rebase_exemple.png}
\begin{figure}[h]
\centering
\input{src/tikz/avant_rebase.tex}
\caption{Avant le rebase}
\label{fig:avant_rebase}
\end{figure}
Rebase de la branche bleue sur la branche verte
\end{center}
\begin{figure}[h]
\centering
\input{src/tikz/apres_rebase.tex}
\caption{Après le rebase}
\label{fig:apres_rebase}
\end{figure}
\end{frame}
\begin{frame}[fragile]
......
\tikzstyle{commit}=[draw,circle]
\begin{tikzpicture}[scale=0.7]
\node[commit, fill=green!60] (C3)at(4,0){C3};
\node[commit, fill=green!60] (C5)at(6,0){C5};
\node[commit, fill=green!60] (C7)at(8,0){C7};
\node[commit, text=red, fill=cyan!80] (C4)at(10,0){C4'};
\node[commit, text=red, fill=cyan!80] (C6)at(12,0){C6'};
\draw[->, >=latex] (C5) -- (C3) ;
\draw[->, >=latex] (C7) -- (C5) ;
\draw[->, >=latex] (C4) -- (C7) ;
\draw[->, >=latex] (C6) -- (C4) ;
\end{tikzpicture}
\tikzstyle{commit}=[draw,circle]
\begin{tikzpicture}[scale=0.7]
\node[commit, fill=green!60] (C3)at(4,-1.5){C3};
\node[commit, fill=green!60] (C5)at(6,-1.5){C5};
\node[commit, fill=green!60] (C7)at(8,-1.5){C7};
\node[commit, fill=cyan!90] (C4)at(5,-2.5){C4};
\node[commit, fill=cyan!90] (C6)at(7,-2.5){C6};
\draw[->, >=latex] (C5) -- (C3) ;
\draw[->, >=latex] (C7) -- (C5) ;
\draw[->, >=latex] (C4) -- (C3) ;
\draw[->, >=latex] (C6) -- (C4) ;
\end{tikzpicture}
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