misc tweaks

presentation/presentation.tex

@@ -91,15 +91,15 @@
 %
 % Git Objekte
 %
-\section{Git Objekt Modell}
+\subsection{Git Objekt Modell}
 \begin{frame}
-	\frametitle{\secname}
+	\frametitle{\subsecname}
 	\begin{itemize}
 		\item Git speichert intern \code{objekt}e
 		\item Referenz auf Objekte durch Hash des Zielobjekts
 	\end{itemize}
 	\center
-	\begin{image}
+	\begin{image}[0.7]
 		\img{../grafiken/git-object}
 	\end{image}
 \end{frame}
@@ -277,6 +277,11 @@
 	\end{commandline}
 	~\\
 	Zum branch wechseln
+	\begin{commandline}
+		\cmd{git checkout <branchname>} & \\
+	\end{commandline}
+	~\\
+	Neuen branch erstellen und dorthin wechseln
 	\begin{commandline}
 		\cmd{git checkout -b <branchname>} & \\
 	\end{commandline}

references.bib

@@ -62,10 +62,21 @@
  address = {Bonn},
  publisher = {Informationszentrum Sozialwissenschaften},
  issn = {1431-6943},
- urn = {https://nbn-resolving.org/urn:nbn:de:0168-ssoar-50733-4},
+ url = {https://nbn-resolving.org/urn:nbn:de:0168-ssoar-50733-4},
 }
 @online{gitman,
   title={Git - Reference},
   url={https://git-scm.com/docs/},
   urldate=30.10.2021},
 }
+@inproceedings{silve2020,
+  author={Silva, Leuson Da and Borba, Paulo and Mahmood, Wardah and Berger, Thorsten and Moisakis, João},
+  booktitle={2020 IEEE International Conference on Software Maintenance and Evolution (ICSME)},
+  title={Detecting Semantic Conflicts via Automated Behavior Change Detection},
+  year={2020},
+  volume={},
+  number={},
+  pages={174-184},
+  doi={10.1109/ICSME46990.2020.00026}
+  url = {https://ieeexplore.ieee.org/document/9240661},
+}