this post was submitted on 04 Apr 2024
1114 points (98.1% liked)

Programmer Humor

19564 readers
1202 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
1114
Rebase Supremacy (programming.dev)
submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
238 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] Zangoose@lemmy.one 2 points 7 months ago (1 children)

I feel like squash and merge on GitHub/GitLab is nicer for that anyway though, it makes the main branch so much cleaner automatically

[โ€“] dejected_warp_core@lemmy.world 1 points 7 months ago

If you're using "trunk-based development" (everything is a PR branch or in main), this works great.

If you're using GitFlow, it can make PRs between the major prod/dev/staging branches super messy. It would be nice if GitHub would let you define which merge strategies are allowed per-branch, but that's not a thing (AFAIK). So you're probably better off not squashing in this situation.