veluca/git-tutorial
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: veluca:884c061146a042ebad2b0b3246c1d048b878df34
Branches Tags
veluca:main
veluca:bestbranchever
veluca:awesomerbranch
veluca:awesomebranch
..
compare: veluca:b617a92a28decb88c11d6255ca1df3ec3f687ba6
Branches Tags
veluca:main
veluca:bestbranchever
veluca:awesomerbranch
veluca:awesomebranch

2 commits
884c061146 ... b617a92a28

Author SHA1 Message Date
MrPyriteMiner
b617a92a28 Added some useful info about branches and force pushes 2024-09-15 11:59:47 +02:00
MrPyriteMiner
ab01a4ed7d Added an answer to Ferdi's question 2024-09-15 11:54:54 +02:00
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
READMEINSTEAD.md
View file

@ -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
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"

1
The_Files.txt Normal file
View file

@ -0,0 +1 @@
It seems the files were hiding from Ferdinand.