diff --git a/README.md b/README.md index b14df64..45b983b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Hi +hi diff --git a/READMEINSTEAD.md b/READMEINSTEAD.md index f3a4e32..9e24cd7 100644 --- a/READMEINSTEAD.md +++ b/READMEINSTEAD.md @@ -10,4 +10,13 @@ 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 +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" diff --git a/The_Files.txt b/The_Files.txt new file mode 100644 index 0000000..c799c80 --- /dev/null +++ b/The_Files.txt @@ -0,0 +1 @@ +It seems the files were hiding from Ferdinand. \ No newline at end of file diff --git a/hi.txt b/hi.txt deleted file mode 100644 index 10ddd6d..0000000 --- a/hi.txt +++ /dev/null @@ -1 +0,0 @@ -Hello!