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 diff --git a/blub.txt b/blub.txt new file mode 100644 index 0000000..fad5794 --- /dev/null +++ b/blub.txt @@ -0,0 +1 @@ +blubblubblub diff --git a/iceland.txt b/iceland.txt new file mode 100644 index 0000000..e69de29