594
Commit (sh.itjust.works)
you are viewing a single comment's thread
view the rest of the comments
[-] NegativeLookBehind@lemmy.world 72 points 17 hours ago

If you've ever royally fucked something up in git, that hotline is necessary

[-] synae@lemmy.sdf.org 16 points 13 hours ago
[-] lord_ryvan@ttrpg.network 6 points 13 hours ago

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.

[-] Jesus_666@lemmy.world 1 points 12 hours ago* (last edited 12 hours ago)

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.

[-] expr@programming.dev 18 points 16 hours ago

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).

[-] AdamEatsAss@lemmy.world 8 points 16 hours ago

Have you ever tried a rebase?

[-] expr@programming.dev 25 points 16 hours ago

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 --abort if the rebase is still active, git reflog to find the commit before the rebase if it's finished).

this post was submitted on 07 Feb 2025
594 points (100.0% liked)

Programmer Humor

33243 readers
861 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS