From ab01a4ed7dd97c8578e13fe2385baae87ccf3e55 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:54:54 +0200 Subject: [PATCH 1/2] Added an answer to Ferdi's question --- The_Files.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 The_Files.txt 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 From b617a92a28decb88c11d6255ca1df3ec3f687ba6 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:59:47 +0200 Subject: [PATCH 2/2] Added some useful info about branches and force pushes --- READMEINSTEAD.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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"