From 884c061146a042ebad2b0b3246c1d048b878df34 Mon Sep 17 00:00:00 2001
From: MrPyriteMiner <jerry.schupp@stud.kswe.ch>
Date: Sun, 15 Sep 2024 11:50:18 +0200
Subject: [PATCH] added back the important files I added earlier

---
 READMEINSTEAD.md     | 13 +++++++++++++
 anotherfileagain.txt |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 READMEINSTEAD.md
 create mode 100644 anotherfileagain.txt

diff --git a/READMEINSTEAD.md b/READMEINSTEAD.md
new file mode 100644
index 0000000..f3a4e32
--- /dev/null
+++ b/READMEINSTEAD.md
@@ -0,0 +1,13 @@
+# 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
\ No newline at end of file
diff --git a/anotherfileagain.txt b/anotherfileagain.txt
new file mode 100644
index 0000000..6d20e91
--- /dev/null
+++ b/anotherfileagain.txt
@@ -0,0 +1 @@
+hi there
\ No newline at end of file