canpolat@programming.devM to Git@programming.devEnglish · edit-21 year agoYour Git horror storiesprogramming.devimagemessage-square41fedilinkarrow-up1309file-text
arrow-up1309imageYour Git horror storiesprogramming.devcanpolat@programming.devM to Git@programming.devEnglish · edit-21 year agomessage-square41fedilinkfile-text
We all have been there… For the beginner it’s easy to mess things up. What are your horror stories with Git? Link to xkcd
minus-squareMajesticFlamelinkfedilinkEnglisharrow-up11·edit-21 year agoMe doing a massive rebase Find out at the end I royally messed up somewhere and it does not build at all. I did not push changes to remote before rebaseing I did not push changes to remote before rebasing? suprised picachu
minus-squareTheRealBoner@lemm.eelinkfedilinkEnglisharrow-up9·1 year agoI was going to say… I’m pretty good with git, and rebasing still gives me anxiety haha
minus-squareMajesticFlamelinkfedilinkEnglisharrow-up3·1 year agoHonestly I am now a huge fan of having lots of tiny repositories. It simplifies ci/cd, forces you to split code into logical blocks with stable interfaces, and limits frequency and scope of conflicts.
minus-squareJackbyDev@programming.devlinkfedilinkEnglisharrow-up1·1 year agoPrior to rebasing I still do git tag -f undo in case I screw up so I can do git reset --hard undo if I mess up. I don’t understand reflog lol.
minus-squarecanpolat@programming.devOPMlinkfedilinkEnglisharrow-up8·1 year agoYou can still recover from that (reflog). But with limited experience, it’s a chilling story :D
Me doing a massive rebase
Find out at the end I royally messed up somewhere and it does not build at all.
I did not push changes to remote before rebaseing
I did not push changes to remote before rebasing? suprised picachu
I was going to say… I’m pretty good with git, and rebasing still gives me anxiety haha
Honestly I am now a huge fan of having lots of tiny repositories. It simplifies ci/cd, forces you to split code into logical blocks with stable interfaces, and limits frequency and scope of conflicts.
Prior to rebasing I still do
git tag -f undo
in case I screw up so I can dogit reset --hard undo
if I mess up. I don’t understand reflog lol.You can still recover from that (
reflog
). But with limited experience, it’s a chilling story :Dwish I knew that back then