this post was submitted on 14 Aug 2023
407 points (97.4% liked)

Programmer Humor

19548 readers
1124 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
[–] rookeh@geddit.social 2 points 1 year ago* (last edited 1 year ago)

I've always merged. Rebase simplifies the history graph, but realistically I can't think of a time where that has been important to me, or any of the teams I've worked with.

Maybe on some projects with a huge number of concurrent branches it becomes more important, probably less so for smaller teams.