467
you are viewing a single comment's thread
view the rest of the comments
[-] GigglyBobble@kbin.social 13 points 1 year ago

Merge commits suck.

My biggest issue with GitHub is that it always squashes and merges.

You are aware you're talking about two different pieces of software?

[-] dukk@programming.dev 4 points 1 year ago

Yeah, I am. However GitHub, being the biggest Git hosting provider and all that, makes you use merge commits. FF-merges must be done manually from the command line. While this definitely isn’t a problem for me, many people out there just don’t care and merge without a second thought (which, as I said in my comment, results in having to create a new branch and cherry picking the commits onto there).

[-] themusicman@lemmy.world 5 points 1 year ago

You should check out the repo options on GitHub. It most definitely supports rebase merges, and you can disable other merge types if desired.

this post was submitted on 14 Aug 2023
467 points (97.2% liked)

Programmer Humor

19589 readers
486 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