.

Merge branch 'main' of https://git.soi.ch/veluca/git-tutorial
Blub
2024-09-15 11:45:38 +02:00 · 2024-09-15 11:45:11 +02:00 · 2024-09-15 11:45:01 +02:00
4 changed files with 0 additions and 15 deletions
--- a/READMEINSTEAD.md
+++ b/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
--- a/anotherfileagain.txt
+++ b/anotherfileagain.txt
@ -1 +0,0 @@
-hi there
--- a/blub.txt
+++ b/blub.txt
@ -1 +0,0 @@
-blubblubblub
--- a/iceland.txt
+++ b/iceland.txt
Author	SHA1	Message	Date
ferdinand	b7c4a4945e	.	2024-09-15 11:45:38 +02:00
ferdinand	d8a1ea4af9	Merge branch 'main' of https://git.soi.ch/veluca/git-tutorial	2024-09-15 11:45:11 +02:00
ferdinand	c02e738c63	Blub	2024-09-15 11:45:01 +02:00