this post was submitted on 28 Aug 2024
532 points (97.2% liked)
Programmer Humor
32724 readers
159 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
Jokes on merge.. when a rebase editing goes wrong after +15 commits and six hours, and git hits you with a leadpipe: "do it. Do it again, or reassemble your branch from the reflog." I.e. you commited a change very early, went over bunch of commits resolving/fixing/improving them and at middle way forget if you should
commit --amend
orrebase --continue
to move forward. Choose wrong, and two large change-sets get irreversilbly squashed together (that absolutely shouldn't), with no way to undo. Cheers. ๐