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
Lukas Nagel
itt
Commits
d05b214e
Commit
d05b214e
authored
Nov 30, 2021
by
Lukas Nagel
Browse files
add graphic for merge
parent
8cb68b54
Changes
5
Hide whitespace changes
Inline
Side-by-side
grafiken/merge-fast-forward-premerge.tex
0 → 100644
View file @
d05b214e
\documentclass
{
standalone
}
\input
{
theme
}
\input
{
versiongraph
}
\begin{document}
\begin{tikzpicture}
[versionsgraph]
\commit
{
\cA
}{
lightblue
}{}
;
\commit
[right=of \cA]
{
\cC
}{
lightblue
}{
\cA
}
;
\commit
[below right=of \cC]
{
\cD
}{
lightred
}{
\cC
}
;
\commit
[right=of \cD]
{
\cE
}{
lightred
}{
\cD
}
;
\commit
[right=of \cE]
{
\cF
}{
lightred
}{
\cE
}
;
\branch
{
A
}{
\cF
}
\branch
{
B
}{
\cC
}
\HEAD
{
B
}
\end{tikzpicture}
\end{document}
grafiken/merge-fast-forward.tex
0 → 100644
View file @
d05b214e
\documentclass
{
standalone
}
\input
{
theme
}
\input
{
versiongraph
}
\begin{document}
\begin{tikzpicture}
[versionsgraph]
\commit
{
\cA
}{
lightblue
}{}
;
\commit
[right=of \cA]
{
\cC
}{
lightblue
}{
\cA
}
;
\commit
[right=of \cC]
{
\cD
}{
lightblue
}{
\cC
}
;
\commit
[right=of \cD]
{
\cE
}{
lightblue
}{
\cD
}
;
\commit
[right=of \cE]
{
\cF
}{
lightblue
}{
\cE
}
;
\branch
{
A
}{
\cF
}
\branch
[right=of A]
{
B
}{
\cF
}
\HEAD
{
B
}
\end{tikzpicture}
\end{document}
grafiken/merge-three-way-premerge.tex
0 → 100644
View file @
d05b214e
\documentclass
{
standalone
}
\input
{
theme
}
\input
{
versiongraph
}
\begin{document}
\begin{tikzpicture}
[versionsgraph]
\commit
[ ]
{
\cA
}{
lightblue
}{}
\commit
[right=of \cA ]
{
\cB
}{
lightblue
}{
\cA
}
\commit
[right=of \cB ]
{
\cF
}{
lightblue
}{
\cB
}
\commit
[above right=of \cB]
{
\cC
}{
lightorange
}{
\cB
}
\commit
[right=of \cC ]
{
\cD
}{
lightorange
}{
\cC
}
\commit
[below right=of \cA]
{
\cG
}{
lightred
}{
\cA
}
\commit
[right=of \cG ]
{
\cJ
}{
lightred
}{
\cG
}
\branch
[right=of \cJ]
{
A
}{
\cJ
}
\branch
[right=of \cF]
{
B
}{
\cF
}
\branch
{
C
}{
\cD
}
\HEAD
{
B
}
\end{tikzpicture}
\end{document}
grafiken/merge-three-way.tex
0 → 100644
View file @
d05b214e
\documentclass
{
standalone
}
\input
{
theme
}
\input
{
versiongraph
}
\begin{document}
\begin{tikzpicture}
[versionsgraph]
\commit
[ ]
{
\cA
}{
lightblue
}{}
\commit
[right=of \cA ]
{
\cB
}{
lightblue
}{
\cA
}
\commit
[right=of \cB ]
{
\cF
}{
lightblue
}{
\cB
}
\commit
[above right=of \cB]
{
\cC
}{
lightorange
}{
\cB
}
\commit
[right=of \cC ]
{
\cD
}{
lightorange
}{
\cC
}
\commit
[below right=of \cA]
{
\cG
}{
lightred
}{
\cA
}
\commit
[right=of \cG ]
{
\cJ
}{
lightred
}{
\cG
}
\commit
[right=of \cF ]
{
\cH
}{
lightblue
}{
\cF
,
\cJ
}
\branch
[right=of \cH]
{
B
}{
\cH
}
\branch
[below=of B]
{
A
}{
\cH
}
\branch
{
C
}{
\cD
}
\HEAD
{
B
}
\end{tikzpicture}
\end{document}
presentation/presentation.tex
View file @
d05b214e
...
...
@@ -322,8 +322,11 @@
\item
Dann Zeiger von branch B auf A verschieben
\item
Erzeugt keinen Merge Commit (!)
\end{itemize}
\center
{
\huge
\alert
{
Grafik: Example für ff
}}
\\
{
\huge
\alert
{
Grafik: ergebnis
}}
\center
\begin{figure}
\only
<1>
{
\includegraphics
{
../grafiken/merge-fast-forward-premerge
}}
\only
<2>
{
\includegraphics
{
../grafiken/merge-fast-forward
}}
\end{figure}
\end{frame}
...
...
Write
Preview
Supports
Markdown
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