this post was submitted on 04 Apr 2024

1110 points (98.2% liked)

Programmer Humor

19817 readers

547 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 2 years ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

1110

Rebase Supremacy (programming.dev)

submitted 8 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev

232 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] dejected_warp_core@lemmy.world 1 points 8 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.