add content merge
authorTobias Rueetschi <tobisa.rueetschi@bfh.ch>
Thu, 27 Nov 2014 17:03:12 +0000 (18:03 +0100)
committerTobias Rueetschi <tobias.rueetschi@bfh.ch>
Thu, 27 Nov 2014 18:09:17 +0000 (19:09 +0100)
SmartGitHg_Einleitung.tex
content/merge.tex [new file with mode: 0644]
pictures/merge_1.png [new file with mode: 0644]
pictures/merge_2.png [new file with mode: 0644]
pictures/merge_3.png [new file with mode: 0644]
pictures/merge_4.png [new file with mode: 0644]
pictures/merge_5.png [new file with mode: 0644]

index 0c4f115..d092755 100644 (file)
@@ -37,4 +37,5 @@
 
        \chapter{Repository}
        \input{content/branches}
+       \input{content/merge}
 \end{document}
diff --git a/content/merge.tex b/content/merge.tex
new file mode 100644 (file)
index 0000000..da9b5c7
--- /dev/null
@@ -0,0 +1,38 @@
+% !TEX root = ../SmartGitHg_Einleitung.tex
+
+\section{Merge}
+\label{sec:Merge}
+
+Wenn Features fertig sind, sollten diese wieder im Branch develop aufgenommen werden, dieser Vorgang nennt man mergen. Ein Merge hat als Ausgangslage immer zwei verschiedene Branches.
+
+Als Beispiel wird ein schon fertiges Feature in den Branch develop gemergt.
+
+\begin{minipage}[c]{0.5\textwidth}
+       \centering
+       \includegraphics[width=0.8\textwidth]{pictures/merge_1.png} \\
+       Es wird vom Branch develop ausgegangen
+\end{minipage}
+\begin{minipage}[c]{0.5\textwidth}
+       \centering
+       \includegraphics[width=0.8\textwidth]{pictures/merge_2.png} \\
+       Hier wird ausgew\"ahlt mit was Mergen. Zuerst muss die Ansicht angepasst werden. Oben Rechts den Button "`Branches..."' klicken.
+\end{minipage}
+
+\begin{minipage}[c]{0.5\textwidth}
+       \centering
+       \includegraphics[width=0.8\textwidth]{pictures/merge_3.png} \\
+       Alles wichtige aktivieren und das Fenster per Close schliessen.
+\end{minipage}
+\begin{minipage}[c]{0.5\textwidth}
+       \centering
+       \includegraphics[width=0.8\textwidth]{pictures/merge_4.png} \\
+       Danach den Branch ausw\"ahlen, welcher zu develop gemergt werden soll und auf den Button "`Create Merge-Commit"' klicken.
+\end{minipage}
+
+\begin{minipage}[c]{0.5\textwidth}
+       \centering
+       \includegraphics[width=0.8\textwidth]{pictures/merge_5.png} \\
+       Hier kann der Branch develop einfach Fast-Forward zum Branch Installation geschoben werden oder ein neuer Merge Commit erstellt werden.
+\end{minipage}
+
+Die zwei Branches develop und Installation sind nun gemergt und als Working Copy verf\"ugbar. Nach einem erneuten Kompilieren des Skriptes erscheinen beide Kapitel.
diff --git a/pictures/merge_1.png b/pictures/merge_1.png
new file mode 100644 (file)
index 0000000..1c3f611
Binary files /dev/null and b/pictures/merge_1.png differ
diff --git a/pictures/merge_2.png b/pictures/merge_2.png
new file mode 100644 (file)
index 0000000..689d348
Binary files /dev/null and b/pictures/merge_2.png differ
diff --git a/pictures/merge_3.png b/pictures/merge_3.png
new file mode 100644 (file)
index 0000000..936d2bc
Binary files /dev/null and b/pictures/merge_3.png differ
diff --git a/pictures/merge_4.png b/pictures/merge_4.png
new file mode 100644 (file)
index 0000000..7d5541d
Binary files /dev/null and b/pictures/merge_4.png differ
diff --git a/pictures/merge_5.png b/pictures/merge_5.png
new file mode 100644 (file)
index 0000000..1d2507f
Binary files /dev/null and b/pictures/merge_5.png differ