559

submitted 1 day 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 85 points 1 day ago* (last edited 1 day 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 40 points 1 day ago

Never merge. Only cherry pick.

[-] Rusty@lemmy.ca 3 points 22 hours ago

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

[-] peoplebeproblems@midwest.social 21 points 1 day ago

You have met every team I have ever worked with apparently

[-] NocturnalMorning@lemmy.world 12 points 1 day ago

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

[-] rtxn@lemmy.world 16 points 1 day ago

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

this post was submitted on 16 Aug 2025

559 points (98.3% liked)

Programmer Humor

25773 readers

1740 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