A note about git merge

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.

Steps to merge your development branch into the main branch:

1. Switch to the Target Branch: Before you can merge your development branch into the main branch, you should be on the main branch.

   Stefan Marx | November 2, 2023
   

A test of the new workflow

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’. It is said that song composers of the past used dummy texts as lyrics when writing melodies in order to have a ‘ready-made’ text to sing with the melody. Dummy texts have been in use by typesetters since the 16th century.

trying out footnotes

A post with some footnotes

Here we have a link ¹ that points to ourselves. Here is another link ² that points to some other blog. And now here ³ we have a locally defined footnote as well.

An entry with just some code

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.randint(1, 100)

while True:
    guess = int(input("Guess the number between 1 and 100: "))

    if guess == secret_number:
        print("Congratulations! You guessed the number!")
        break
    elif guess < secret_number:
        print("Too low! Try again.")
    else:
        print("Too high! Try again.")

I am curious, lets go!