Compare commits
2 Commits
main
...
awesomerbr
Author | SHA1 | Date |
---|---|---|
MrPyriteMiner | b617a92a28 | |
MrPyriteMiner | ab01a4ed7d |
|
@ -10,4 +10,13 @@ continue with "git rebase --continue"
|
||||||
then you can pmossibly change the commit message
|
then you can pmossibly change the commit message
|
||||||
then you can push
|
then you can push
|
||||||
git log
|
git log
|
||||||
exists as a log of what happened
|
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"
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
It seems the files were hiding from Ferdinand.
|
Loading…
Reference in New Issue