Programmer Humor

20417 readers

182 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

[email protected]

469

History repeats itself (lemmy.world)

submitted 2 years ago by [email protected] to c/[email protected]

35 comments fedilink hide all child comments

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

[–] [email protected] 32 points 2 years 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.

[–] [email protected] 4 points 2 years ago* (last edited 2 years 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.

load more comments (25 replies)