this post was submitted on 07 Feb 2025
742 points (98.9% liked)
Programmer Humor
33546 readers
325 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
If you've ever royally fucked something up in git, that hotline is necessary
How dare you! First of all, it's a beautiful distributed graph theory tree model...
I have been that friend from the alt text at every place I have worked. I shudder to think how they're going about their projects without me, now.
I'm kinda planning on teaching my team how to use interactive rebases to clean the history before a merge request.
The first thing they'll learn is to make a temporary second branch so they can just toss their borked one if they screw up. I'm not going to deal with their git issues for them.
These two statements contradict each other.
I disagree. I don't wanna deal with my coworkers work, so I'm teaching them to deal with it themselves. Not necessarily in the best way for them to do it, but in an easy way to teach and an easy way to get right
That's why I'll make damn sure they'll make that second branch first.
Mind you, the most likely result is that I'll still see branches with 50+ commits with meaningless names because nobody ever rebases anything.
Never understood why this is such a trope. There's very little you can't recover in git (basically, only changes you never committed in the first place).
Have you ever tried a rebase?
Not sure if serious or not, but yeah I use interactive rebases every day, many times a day (it's nice for keeping a clean, logical history of atomic changes).
It's very simple to recover if you accidentally do something you don't intend (
git rebase --abortif the rebase is still active,git reflogto find the commit before the rebase if it's finished).