Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Picasoft
APIs
Init
Git
Commits
e66b68e4
Unverified
Commit
e66b68e4
authored
Jan 14, 2019
by
Rémy Huet
💻
Browse files
Figures merge et rebase
parent
3cb4f586
Pipeline
#33387
passed with stage
in 21 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/tex/gestion_non_lineaire/fusionner_branches.tex
View file @
e66b68e4
...
...
@@ -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]
...
...
src/tikz/apres_rebase.tex
0 → 100644
View file @
e66b68e4
\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}
src/tikz/avant_rebase.tex
0 → 100644
View file @
e66b68e4
\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}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment