From 360cd08c713771b057b71762060375989998da39 Mon Sep 17 00:00:00 2001 From: 42kangaroo Date: Sun, 15 Sep 2024 11:43:20 +0200 Subject: [PATCH 1/6] Hi, I just Icelanded --- iceland.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 iceland.txt diff --git a/iceland.txt b/iceland.txt new file mode 100644 index 0000000..e69de29 From 5ec4f4adf61eb06baeba57076bf37e0d2ad7c2b9 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:43:28 +0200 Subject: [PATCH 2/6] fixed the conflicts and added my files --- README.md | 1 + READMEINSTEAD.md | 13 +++++++++++++ anotherfile.txt | 1 + anotherfileagain.txt | 1 + 4 files changed, 16 insertions(+) create mode 100644 README.md create mode 100644 READMEINSTEAD.md create mode 100644 anotherfile.txt create mode 100644 anotherfileagain.txt diff --git a/README.md b/README.md new file mode 100644 index 0000000..2965834 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Hello World 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/anotherfile.txt b/anotherfile.txt new file mode 100644 index 0000000..6d20e91 --- /dev/null +++ b/anotherfile.txt @@ -0,0 +1 @@ +hi there \ 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 632baf7176b4a91f396e43445aac90e25ed18cbf Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:30:09 +0200 Subject: [PATCH 3/6] Added a nice command to know --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2965834..6992ffe 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # Hello World +git commit -a -m "Message" +This command adds all modified files, but not new ones, to a commit immediately. \ No newline at end of file From b66fc8c46c0ebbcdffd4b36152825b963d1eb581 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:36:16 +0200 Subject: [PATCH 4/6] Added even more useful commands --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6992ffe..f3a4e32 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ # Hello World git commit -a -m "Message" -This command adds all modified files, but not new ones, to a commit immediately. \ No newline at end of file +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 From 115d99107ccea87fc3fa9d1a0c794152c3e4c4ef Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:40:58 +0200 Subject: [PATCH 5/6] I renamed the file --- README.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index f3a4e32..0000000 --- a/README.md +++ /dev/null @@ -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 \ No newline at end of file From cd3e53b751205c27faa2250721f1dfd906fa6c03 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:42:14 +0200 Subject: [PATCH 6/6] another file name change --- anotherfile.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 anotherfile.txt diff --git a/anotherfile.txt b/anotherfile.txt deleted file mode 100644 index 6d20e91..0000000 --- a/anotherfile.txt +++ /dev/null @@ -1 +0,0 @@ -hi there \ No newline at end of file