Programmer Humor

20383 readers

1702 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] 4 points 2 years ago* (last edited 2 years ago) (4 children)

for some reason it's easier than normal rebasing though

[–] [email protected] 3 points 2 years ago (3 children)

Have you tried interactive rebase (rebase -i)? I find it very useful

[–] [email protected] 0 points 2 years ago (2 children)

Yeah, but then you deal with merge conflicts

[–] [email protected] 2 points 2 years ago

rerere is a lifesaver here.

(I'm also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)

load more comments (1 replies)