From 5ec4f4adf61eb06baeba57076bf37e0d2ad7c2b9 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:43:28 +0200 Subject: [PATCH] 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