this post was submitted on 14 Aug 2023
464 points (97.7% liked)

Programmer Humor

19544 readers
681 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
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] GandarfDeGrape@midwest.social 31 points 1 year ago (26 children)

OK. Query.

Rebase or merge into current?

I personally never rebase. It always seems to have some problem. I'm surely there's a place and time for rebasing but I've never seen it in action I guess.

Rebase. Merge into current leaves merge commits in the dev branches.

load more comments (25 replies)