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.
For any major operations like this, I always save the current commit with a tag. Very easy to get back to the original commit in case something blows up.
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
You can still recover from that (
reflog
). But with limited experience, it’s a chilling story :Dwish I knew that back then
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.For any major operations like this, I always save the current commit with a tag. Very easy to get back to the original commit in case something blows up.