this post was submitted on 16 Aug 2025
578 points (98.0% liked)

Programmer Humor

32833 readers
1893 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 3 years ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
578
What do you call your production branch? (lemmy.nz)
submitted 1 year ago by hellfire103@lemmy.ca to c/programmer_humor@programming.dev
59 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] rtxn@lemmy.world 91 points 1 year ago* (last edited 1 year ago) (4 children)

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 46 points 1 year ago

Never merge. Only cherry pick.

[–] peoplebeproblems@midwest.social 21 points 1 year ago

You have met every team I have ever worked with apparently

[–] NocturnalMorning@lemmy.world 12 points 1 year ago (1 children)

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

[–] rtxn@lemmy.world 17 points 1 year ago

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

[–] Rusty@lemmy.ca 3 points 1 year ago

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.