this post was submitted on 16 Aug 2025

586 points (97.9% liked)

Programmer Humor

programmer_humor@programming.dev

33,616 readers

7,642 active

1,718 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics
- If the mod doesn't find it funny, you're banned. Ha-ha!... For real: do not use the community for "statements". There are other places for such content. Keep it chill and funny.

founded 3 years ago

moderators

anzo@programming.dev

Feyter@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

What do you call your production branch? (europe.pub)

submitted 1 year ago by hellfire103@lemmy.ca to c/programmer_humor@programming.dev

60 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 1 year ago* (5 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.

hideshow 5 child comments

[–] SeductiveTortoise@piefed.social 47 points 1 year ago

Never merge. Only cherry pick.

parent

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

You have met every team I have ever worked with apparently

parent

[–] NocturnalMorning@lemmy.world 13 points 1 year ago (1 child)

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

parent

hideshow 1 child comment

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

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

parent

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

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

parent