Commit fd4b9fc1 authored by Sven Greiner's avatar Sven Greiner
Browse files

Mergekonflikte

parent 05939628
......@@ -506,7 +506,34 @@
\end{frame}
\begin{frame}{Mergekonflikte}
% TODO
\begin{itemize}
\item Wenn etwas nicht passt \ldots
\medskip
\qquad\begin{varwidth}{15cm}
\ttfamily\footnotesize
\$ git merge foo \\
Auto-merging test.txt \\
CONFLICT (content): Merge conflict in test.txt \\
Automatic merge failed; fix conflicts and then commit the result.
\end{varwidth}
\bigskip
\item Konflikte in der Datei hervorgehoben:
\medskip
\qquad\begin{varwidth}{15cm}
\ttfamily\footnotesize
ullamcorper eget posuere diam. Morbi \\
\textcolor{gitbranchcolor}{<<<<<<< HEAD} \\
nunc master-asdf, vestibulum ac accumsan \\
\textcolor{gitbranchcolor}{=======} \\
nunc foobar, vestibulum ac accumsan \\
\textcolor{gitbranchcolor}{>>>>>>> foo} \\
vitae, sollicitudin vitae est. Fusce
\end{varwidth}
\end{itemize}
\end{frame}
\begin{frame}
......
Supports Markdown
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