this post was submitted on 16 Aug 2025
427 points (98.6% liked)

Programmer Humor

25755 readers
1532 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
anzo@programming.dev
Feyter@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
427
What do you call your production branch? (lemmy.ca)
submitted 14 hours ago by hellfire103@lemmy.ca to c/programmer_humor@programming.dev
51 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] rtxn@lemmy.world 75 points 14 hours ago* (last edited 14 hours 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.

[–] Rusty@lemmy.ca 1 points 57 minutes ago

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

[–] SeductiveTortoise@piefed.social 34 points 13 hours ago

Never merge. Only cherry pick.

[–] peoplebeproblems@midwest.social 17 points 13 hours ago

You have met every team I have ever worked with apparently

[–] NocturnalMorning@lemmy.world 10 points 13 hours ago (1 children)

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

[–] rtxn@lemmy.world 12 points 12 hours ago

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