From 075583d7e02b31ea912bc9e0fb7ee75654142064 Mon Sep 17 00:00:00 2001 From: "taco.cato" Date: Sun, 15 Sep 2024 11:42:15 +0200 Subject: [PATCH 1/4] helloo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e69de29..45b983b 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +hi From 851be27fc03c6b7db5e3d6a377907a3fd4976e28 Mon Sep 17 00:00:00 2001 From: Cheng Zhong Date: Sun, 15 Sep 2024 11:48:39 +0200 Subject: [PATCH 2/4] hello! --- hello.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..c2cb227 --- /dev/null +++ b/hello.txt @@ -0,0 +1 @@ +test from cheng From 884c061146a042ebad2b0b3246c1d048b878df34 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:50:18 +0200 Subject: [PATCH 3/4] 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 From 9b636b5dcc09514ff8cdce9434d94d5a853281da Mon Sep 17 00:00:00 2001 From: Luca Versari Date: Sun, 15 Sep 2024 11:52:23 +0200 Subject: [PATCH 4/4] Awesome commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45b983b..b14df64 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -hi +Hi