Rendu

rapport.tex

@@ -305,5 +305,77 @@
 	\end{center}
 
    \part{Git}
+   \chapter{Utilisation basique}
+   \section{}
+   \fbox{\begin{minipage}{\textwidth}
+   		\begin{itemize}
+			\item git init
+			\item git config user.name "Yann"
+			\item git config user.email "yann.jaulin@etu.univ-lorraine.fr"
+			\item git status
+			\item Le fichier .vagrant a \'{e}t\'{e} cr\'{e}\'{e}, mais on ne veux pas le commit, il faut le mettre dans un gitignore
+			\item echo .vagrant/ > .gitignore
+			\item git add .
+			\item git commit -m "Vagrant"
+			\item git show HEAD
+		\end{itemize}
+   \end{minipage}}
+
+	\chapter{Les branches}
+	\section{}
+	\fbox{\begin{minipage}{\textwidth}
+		\begin{itemize}
+			\item git checkout -b new
+			\item git add -p
+			\item git commit -m "1"
+			\item git add .
+			\item git commit -m "2"
+			\item git checkout main
+			\item Elle est vide
+		\end{itemize}
+	\end{minipage}}
+
+	\chapter{Réintégrer les changements}
+	\section{}
+	\fbox{\begin{minipage}{\textwidth}
+		\begin{itemize}
+			\item git merge new
+			\item git show HEAD
+			\item le commit est la m\^{e}me dans main et new
+			\item git branch
+			\item oui, il faut la supprimer
+			\item git branch -D new
+		\end{itemize}
+	\end{minipage}}
+
+	\chapter{Conflits}
+	\section{}
+	\fbox{\begin{minipage}{\textwidth}
+		\begin{itemize}
+			\item git checkout -b forward-new-port
+			\item git merge forward-new-port
+			\item git status
+			
+			<<<<<<< HEAD
+			
+			b.vm.network "private\_network", ip: "192.168.56.3:8080"
+			
+			=======
+			
+			b.vm.network "private\_network", ip: "192.168.56.3:8081"
+			
+			>>>>>>> forward-new-port
+			\item git add .
+			\item git status
+			\item git merge --continue
+		\end{itemize}
+	\end{minipage}}
+
+	\newpage
+	
+	\begin{center}
+		\includegraphics[width=12cm]{theend}
+		\textcopyright 2022 Yann \texttrademark
+	\end{center}
 
 \end{document}
\ No newline at end of file