This is my blog. There are many like it, but this one is mine.
I stole this shameless from Kris.
Overview: git merge is a command that lets you take the independent lines of development created by git branch and integrate them into a single branch. When you merge two branches, Git tries to automatically join the diverged paths of development. For the purpose of this explanation: The branch you want to merge from is called the source branch. The branch you want to merge into is called the target branch.
Stefan Marx |This is the first test of the new workflow Dummy text: Its function as a filler or as a tool for comparing the visual impression of different typefaces Dummy text is text that is used in the publishing industry or by web designers to occupy the space which will later be filled with ‘real’ content. This is required when, for example, the final text is not yet available. Dummy text is also known as ‘fill text’.
Stefan Marx |A post with some footnotes Here we have a link1 that points to ourselves. Here is another link 2 that points to some other blog. https://www.linux-lunatix.org/ ↩︎ https://blog.fefe.de/ ↩︎
Stefan Marx |some code, some code! Now I want to see, how code looks like, if I pplace it in the org file. Here we go: (use-package all-the-icons :if (display-graphic-p) :commands all-the-icons-install-fonts :init (unless (find-font (font-spec :name "all-the-icons")) (all-the-icons-install-fonts t))) (use-package hydra) (defhydra hydra-text-scale (:timeout 4) "scale text" ("j" text-scale-increase "in") ("k" text-scale-decrease "out") ("f" nil "finished" :exit t)) And we will also try some python code, of course: import random secret_number = random.
Stefan Marx |