this post was submitted on 04 Apr 2024
631 points (100.0% liked)

Programmer Humor

421 readers
1 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 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
631
Rebase Supremacy (programming.dev)
submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
107 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] magic_lobster_party@kbin.run 3 points 7 months ago (1 children)

How others are keeping their branches up to date is their problem. If you use Gitlab you can set up squash policy for merge requests. All the abomination they’ve caused in their branch will turn into one nice commit to the main branch.

[–] expr@programming.dev 5 points 7 months ago

I don't want squashed commits. It makes git tools worse (git bisect, git cherry-pick, etc.) and I work very hard to craft a meaningful set of commits for my work and I don't want to throw all of that away.

But yeah, I don't actually give a shit what they are doing on their branches. I regularly rebase onto master anyway.