Compare commits
No commits in common. "b617a92a28decb88c11d6255ca1df3ec3f687ba6" and "884c061146a042ebad2b0b3246c1d048b878df34" have entirely different histories.
b617a92a28
...
884c061146
|
@ -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
|
|
@ -1 +0,0 @@
|
|||
It seems the files were hiding from Ferdinand.
|
Loading…
Reference in New Issue