this post was submitted on 09 Oct 2025
4 points (100.0% liked)

Programmer Humor

27117 readers
1155 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
4
we did a little bit of branch fuckery (lemmy.dbzer0.com)
submitted 3 weeks ago by somerandomperson@lemmy.dbzer0.com to c/programmer_humor@programming.dev
6 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] Everyday0764@lemmy.zip 0 points 3 weeks ago

in the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it's the MR) always rebase.

this leaves a very readable history, with each feature branch highlighted and no mixture in the commits...

i haven't found any downside yet... maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult