Merge branch 'main' of git.soi.ch:veluca/git-tutorial

READMEINSTEAD.md

@@ -1,13 +0,0 @@
-# Hello World
-git commit -a -m "Message" 
-This command adds all modified files, but not new ones, to a commit immediately.
-
-If someone else already commit smth, pull it with 
-git pull -r
-Now you start resolving conflicts. If there's a conflict, you gotta deal with it. Keep doing that till you're done
---> Happiness
-continue with "git rebase --continue"
-then you can pmossibly change the commit message
-then you can push
-git log
-exists as a log of what happened

anotherfileagain.txt

@@ -1 +0,0 @@
-hi there

blub.txt

@@ -1 +0,0 @@
-blubblubblub

hello.txt

@@ -0,0 +1 @@
+test from cheng