diff --git a/README.md b/README.md index 45b983b..b14df64 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -hi +Hi diff --git a/READMEINSTEAD.md b/READMEINSTEAD.md index 9e24cd7..f3a4e32 100644 --- a/READMEINSTEAD.md +++ b/READMEINSTEAD.md @@ -10,13 +10,4 @@ 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 - -if you're on another branch, you can get the changes from main by using this command: -git pull -r origin (Branch) -e.g. git pull -r origin main -Then you can pull that and fix the conflicts to then merge them again. - -how to force push (dark arts, don't do that on master branch, ever) -git push -f ---> this says "No, my local history is correct. Delete everything else" +exists as a log of what happened \ No newline at end of file diff --git a/The_Files.txt b/The_Files.txt deleted file mode 100644 index c799c80..0000000 --- a/The_Files.txt +++ /dev/null @@ -1 +0,0 @@ -It seems the files were hiding from Ferdinand. \ No newline at end of file diff --git a/hi.txt b/hi.txt new file mode 100644 index 0000000..10ddd6d --- /dev/null +++ b/hi.txt @@ -0,0 +1 @@ +Hello!