this post was submitted on 12 Dec 2023
780 points (99.0% liked)

Programmer Humor

23844 readers
2658 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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
780
Manager: This task only takes 30 minutes. Why did it take you the whole day? (programming.dev)
submitted 2 years ago by hypnotic_nerd@programming.dev to c/programmer_humor@programming.dev
96 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] Johanno@feddit.de 7 points 2 years ago (2 children)

We make a singular commit per feature.

[–] KairuByte@lemmy.dbzer0.com 5 points 2 years ago

I always find this hard to follow personally.

[–] pomodoro_longbreak@sh.itjust.works 2 points 2 years ago (1 children)

Trunk based, eh? Yeah, we do that on a couple teams where I'm at, too. I like the philosophy, but force pushing the same commit over and over as you're incorporating review feedback is antisocial, especially when you've got devs trying to test your changes out on their machines.

[–] Omgpwnies@lemmy.world 3 points 2 years ago (1 children)

eh, just squash and merge. Feature branch can be messy as long as main is clean

[–] Johanno@feddit.de 1 points 2 years ago

Yep. You have to make sure your feature branch works.