Skip to content
Snippets Groups Projects
Commit 05a452cb authored by LarsZauberer's avatar LarsZauberer
Browse files

Fixes about closing the editors

parent 0e0a2da9
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment