585

submitted 7 months ago by hellfire103@lemmy.ca to c/programmer_humor@programming.dev

61 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] rtxn@lemmy.world 93 points 7 months ago* (last edited 7 months ago)

Branch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.

[-] SeductiveTortoise@piefed.social 47 points 7 months ago

Never merge. Only cherry pick.

[-] peoplebeproblems@midwest.social 22 points 7 months ago

You have met every team I have ever worked with apparently

[-] NocturnalMorning@lemmy.world 13 points 7 months ago

How have you survived in this world without exploding into a million little fiery merge conflicts?

[-] rtxn@lemmy.world 18 points 7 months ago

I let the interns handle those. If they survive, they get bragging rights.

[-] Rusty@lemmy.ca 3 points 6 months ago

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

this post was submitted on 16 Aug 2025

585 points (97.9% liked)

Programmer Humor

30365 readers

1274 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 2 years ago

MODERATORS