diff --git a/git_series/eth/advanced_course/advanced_course.pdf b/git_series/eth/advanced_course/advanced_course.pdf index e6a47e2b87662a2d9ce569c5294daebf88bf0f80..4bd1c4eab8777f9c1226fa2367187d3bdd513fbc 100644 Binary files a/git_series/eth/advanced_course/advanced_course.pdf and b/git_series/eth/advanced_course/advanced_course.pdf differ diff --git a/git_series/eth/advanced_course/advanced_course.typ b/git_series/eth/advanced_course/advanced_course.typ index 064085f3ae8fd7cbe38df418720effa1010f5dcd..7221d89807a81f4da626cde346711f6f70826058 100644 --- a/git_series/eth/advanced_course/advanced_course.typ +++ b/git_series/eth/advanced_course/advanced_course.typ @@ -485,22 +485,30 @@ git merge --continue node((3,0), "main", stroke: stroke(0em)), // Cats Branch - node((0.75,-1), [#text(size:0.75em)[sleep]], radius:1em), - node((3,-1), "cats", stroke: stroke(0em)), + node((0.75,-0.75), [#text(size:0.75em)[sleep]], radius:1em), + node((3,-0.75), "cats", stroke: stroke(0em)), // Main Edges edge((0,0), (0.75,0), "-|>"), // Cats Edges - edge((0,0), (0.75,-1), "-|>"), + edge((0,0), (0.75,-0.75), "-|>"), // Merge Edges edge((0.75,0), (1.5,0), "-|>"), - edge((0.75,-1), (1.5,0), "-|>"), + edge((0.75,-0.75), (1.5,0), "-|>"), ) ) ] +== Ending the Merging Process + +If you end up in the terminal editor *nano* press *"CTRL + x"* + +If you end up in the terminal editor *vim* press *":q"* + +Both will close the terminal editor and the *default commit message* for the *merge commit* is used. + == Aborting the Merging Process If you would have wanted to abort the merge you could have also run