diff --git a/module1/slides/diapos_git.org b/module1/slides/diapos_git.org index b1282bf611649b40fd162dbefe4d3dab3173d0cf..7284fd02f2bf2c094c33e195288b2ad92ee54f89 100644 --- a/module1/slides/diapos_git.org +++ b/module1/slides/diapos_git.org @@ -205,13 +205,13 @@ Accès à un certain nombre de fichiers. \node<1>[fit=(v0), fill=green!30, ellipse, opacity=.8] {}; \end{pgfonlayer} \gd<2-3>{ v0 -- v1 -- v2 --v3 } - \ga<2>{\Large Alice working locally}{right=of v0} + \ga<2>{\Large Alice travaille en local}{right=of v0} \ga<3>{\LARGE git {\bf push}}{right=of v0} \begin{pgfonlayer}{background} \node<3>[fit=(v0)(v3), fill=green!30, ellipse] {}; \end{pgfonlayer} \gd<4-6>{ v0 -- v1 -- v2 --v3 -- v4 -- {{[nodes=unreachable] v5}, v5' -- v6 -- v7}} - \ga<4>{\Large Alice working locally}{right=of v0} + \ga<4>{\Large Alice travaille en local}{right=of v0} \ga<5>{\LARGE git {\bf push}}{right=of v0} \begin{pgfonlayer}{background} \node<5>[fit=(v4)(v7), fill=green!30,ellipse,rotate=-30] {}; @@ -613,7 +613,32 @@ Accès à un certain nombre de fichiers. #+BEGIN_EXPORT latex % Liens de Benoît avec Origin/master \draw<1-2>[DAGrefedge] (C) -- (origmaster1); + \onslide<3>{ + % Remote branch + \gitremotebranch + [origmaster2] + {origin/master} + {left=of E} + {E} + } \draw<4-5>[DAGrefedge] (E) -- (origmaster2); + \onslide<6-7>{ + % Remote branch + \gitremotebranch + [origmaster2] + {origin/master} + {left=of E, opacity=0.5} + {E} + } + \draw<8>[DAGrefedge] (F) -- (origmaster); + \onslide<9>{ + % Remote branch + \gitremotebranch + [origmaster3] + {origin/master} + {left=of H} + {H} + } \draw<10>[DAGrefedge] (H) -- (origmaster3); #+END_EXPORT *** Gitlab :ignore: @@ -693,14 +718,22 @@ Accès à un certain nombre de fichiers. #+END_EXPORT *** Actions :ignore: #+BEGIN_EXPORT latex + \onslide<1-2>{ + % Remote branch + \gitremotebranch + [origmaster] + {master} + {right=of C} + {C} + } % Actions % Push de Benoît \draw<3>[->,-Latex] (historique de Benoit) to[out=90,in=0] node[midway,font=\scriptsize,above right]{\texttt{git push}} (origin); - \onslide<3>{ + \onslide<3-5>{ % Remote branch \gitremotebranch [origmaster] - {origin/master} + {master} {right=of E} {E} } @@ -710,22 +743,14 @@ Accès à un certain nombre de fichiers. % Push de Chloé \draw<6>[->,-Latex] (historique de Chloe) to[out=90,in=180] node[midway,font=\scriptsize,above left]{\texttt{git push}} (origin); - \onslide<6>{ - % Remote branch - \gitremotebranch - [origmaster] - {origin/master} - {left=of F1} - {F1} - } % Push raté de Benoît \draw<7>[->,-Latex] (historique de Benoit) to[out=90,in=0] node[midway,font=\scriptsize,above right, strike out, draw=red, line width=2pt]{\texttt{git push}} (origin); - \onslide<7-8>{ + \onslide<6-8>{ % Remote branch \gitremotebranch [origmaster] - {origin/master} + {master} {right=of F} {F} } @@ -739,7 +764,7 @@ Accès à un certain nombre de fichiers. % Remote branch \gitremotebranch [origmaster] - {origin/master} + {master} {right=of H} {H} }