Commit f1fcbca3 authored by Mihai's avatar Mihai

Corrected problems observed after course.

parent cb61e19e
......@@ -437,11 +437,26 @@
\end{center}
\end{pframe}
\subsection{No }
error: Your local changes to the following files would be overwritten by merge:
data/capitals.txt
Please, commit your changes or stash them before you can merge.
Aborting
\subsection{Note}
\begin{pframe}
Make sure that the working directory is clean before merging.
\medskip
Otherwise:
\vspace{-0.3cm}
\begin{framed}
\lstinline{$} \textcolor{git-color}{\lstinline{git}} \textcolor{command-color}{\lstinline{merge}}
\textcolor{argument-color}{\lstinline{lib}}\\
\lstinline{error: Your local changes to the following files}\\
\lstinline{ would be overwritten by merge:}\\
\lstinline{ testlib.py}\\
\lstinline{Please, commit your changes or stash them before}\\
\lstinline{you can merge.}\\
\lstinline{Aborting}
\end{framed}
\end{pframe}
\subsection{Deleting branches}
......@@ -501,7 +516,7 @@ Aborting
\lstinline{* }\textcolor{commit-id}{\lstinline{1f6d2ab}}\lstinline{ Initial commit}
\end{framed}
We'd like to merge branch \lstinline{hue} into \lstinline{master}.
We'd like to merge branch \textcolor{branch}{\lstinline{hue}} into \textcolor{branch}{\lstinline{master}}.
\end{pframe}
\subsection{Setting the stage (2/3)}
......@@ -592,8 +607,8 @@ Aborting
}
\end{framed}
What we had is under \lstinline{HEAD}, what \lstinline{hue} had is
above \lstinline{hue}.
What we had is under \textcolor{head}{\lstinline{HEAD}}, what \textcolor{branch}{\lstinline{hue}} had is
above \textcolor{branch}{\lstinline{hue}}.
\end{pframe}
\subsection{Resolving a merge conflict (2/3)}
......
......@@ -85,7 +85,7 @@
\end{multicols}
\vspace{-0.3cm}
\item In order to merge a branch into another one do we have to add and commit changes first?
\item In order to merge a branch do we have to add and commit, or discard any changes first?
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
......@@ -189,7 +189,7 @@ Please navigate to that directory and try to use the commands presented during t
\item Merge branch \colorbox{gray!20}{documentation} into \colorbox{gray!20}{master}.
\item What merge type is performed if branch \colorbox{gray!20}{documentation} is merged into \colorbox{gray!20}{master}?
\item What merge type is performed if branch \colorbox{gray!20}{data} is merged into \colorbox{gray!20}{master}?
\vspace{-0.2cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
......@@ -200,7 +200,7 @@ Please navigate to that directory and try to use the commands presented during t
\end{enumerate}
\end{multicols}
\item Merge branch \colorbox{gray!20}{documentation} into \colorbox{gray!20}{master}.
\item Merge branch \colorbox{gray!20}{data} into \colorbox{gray!20}{master}.
\end{enumerate}
......@@ -214,18 +214,23 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Checkout branch \colorbox{gray!20}{data} and create a new branch called \colorbox{gray!20}{data-europe}.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Edit the \colorbox{gray!20}{data/capitals.txt} file by adding at the end Rome as Italy's capital (``Italy:Rome'').
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.1cm}
\item Edit the \colorbox{gray!20}{data/capitals.txt} file by adding at the end of it Rome as Italy's capital (``Italy:Rome'').
Do not remove or make any changes to the information already present there.
\vspace{-0.1cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data} and merge the \colorbox{gray!20}{data-europe} branch into it.
\vspace{-0.1cm}
\item Why was the previous merge a fast-forward one?
\vspace{-0.2cm}
\vspace{-0.3cm}
\begin{multicols}{2}
\begin{enumerate}[label=(\alph*)]
\item it was not
......@@ -241,7 +246,7 @@ Next, you will make some file changes and manipulate the commit graph even furth
\begin{enumerate}
\item Make sure branch \colorbox{gray!20}{data} is active (checkedout).
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Correct the USA capital to Washington D.C. in the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.1cm}
......@@ -250,10 +255,10 @@ Next, you will make some file changes and manipulate the commit graph even furth
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Add Paris as capital of France at the end of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
......@@ -269,16 +274,16 @@ Next, you will make some file changes and manipulate the commit graph even furth
\vspace{-0.1cm}
\item Add Moscow as capital of Russia at the end of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
\item Checkout branch \colorbox{gray!20}{data-europe}.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Add Madrid as Spain's capital at the of the \colorbox{gray!20}{data/capitals.txt} file.
\vspace{-0.1cm}
\vspace{-0.2cm}
\item Stage and commit the changes.
\vspace{-0.1cm}
......
......@@ -10,8 +10,8 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="300.00003mm"
height="189.99991mm"
viewBox="0 0 1062.9922 673.22805"
height="189.99992mm"
viewBox="0 0 1062.9922 673.2281"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
......@@ -2084,8 +2084,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.42479074"
inkscape:cx="915.71401"
inkscape:cy="-662.48274"
inkscape:cx="891.91636"
inkscape:cy="708.0093"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
......@@ -2102,11 +2102,11 @@
inkscape:guide-bbox="true"
units="mm">
<sodipodi:guide
position="1250.3858,10895.143"
position="1250.3858,10155.143"
orientation="1,0"
id="guide5111" />
<sodipodi:guide
position="1245.1046,10893.508"
position="1245.1046,10153.508"
orientation="0,1"
id="guide5113" />
</sodipodi:namedview>
......@@ -2126,7 +2126,7 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-63.5398,-10227.781)">
transform="translate(-63.5398,-9487.7809)">
<path
inkscape:connector-curvature="0"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
......@@ -3180,7 +3180,7 @@
id="tspan7964">lib</tspan></text>
<path
inkscape:connector-curvature="0"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:"
d="m 63.5398,9487.7809 0,656.0001 0,17.228 294.99219,0 473.00781,0 294.9922,0 0,-17.228 0,-638.7716 0,-17.2285 -294.9922,0 -768,0 z"
id="path16291" />
<path
......@@ -3752,7 +3752,7 @@
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:'Noto Sans Mono CJK TC';-inkscape-font-specification:'Noto Sans Mono CJK TC';text-align:center;text-anchor:middle;fill:#696969;fill-opacity:1"
y="9660.8125"
x="488.83496"
sodipodi:role="line">Master</tspan></text>
sodipodi:role="line">master</tspan></text>
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
......
This diff is collapsed.
This diff is collapsed.
......@@ -98,14 +98,14 @@
\end{lstlisting}
\end{pframe}
\begin{pframe}
\begin{figure}[]
\begin{center}
\includegraphics[width=\textwidth]{markdown}
\end{center}
\caption{Rendered markdown page.}
\end{figure}
\end{pframe}
% \begin{pframe}
% \begin{figure}[]
% \begin{center}
% \includegraphics[width=\textwidth]{markdown}
% \end{center}
% \caption{Rendered markdown page.}
% \end{figure}
% \end{pframe}
\subsection{The toplevel ``README.md'' file}
\begin{pframe}
......@@ -320,9 +320,9 @@
\begin{tabular}{ll}
option & description\\
\hline
\lstinline{-f} & Force (really remove).\\
\lstinline{-x} & Also remove \emph{ignored} files.\\
\lstinline{-n} & Do a \emph{dry run}.\\
% \lstinline{-f} & Force (really remove).\\
% \lstinline{-x} & Also remove \emph{ignored} files.\\
% \lstinline{-n} & Do a \emph{dry run}.\\
\end{tabular}
\end{center}
\caption{Common options.}
......
Markdown is supported
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