this post was submitted on 14 Aug 2023

470 points (97.4% liked)

Programmer Humor

19623 readers

96 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 1 year ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

470

History repeats itself (lemmy.world)

submitted 1 year ago by alphacyberranger@lemmy.world to c/programmer_humor@programming.dev

35 comments fedilink hide all child comments

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

[–] dukk@programming.dev 4 points 1 year ago (1 children)

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.