this post was submitted on 02 Aug 2023
1587 points (99.5% liked)

Programmer Humor

19589 readers
649 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] BuiltWithStolenParts@lemmy.world 7 points 1 year ago (1 children)

Try reverting a reverted commit (revert of revert, yes) while other team members are working on a branch which has the first revert. It's super fun merging after that.

(Or something of that effect, can't remember the exact details of that fuckup)

[โ€“] hellishharlot@lemmy.world 3 points 1 year ago

I don't think I will, mostly cause I work on a team of 1 right now which makes my branches wonderfully simple.