Compare commits
2 commits
awesomerbr
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| f72d52ecf2 | |||
| 51ffabbb68 |
4 changed files with 3 additions and 12 deletions
|
|
@ -1 +1 @@
|
|||
hi
|
||||
Hi
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
1
hi.txt
Normal file
1
hi.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
Hello!
|
||||
Loading…
Add table
Add a link
Reference in a new issue