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

[–] fiah@discuss.tchncs.de 4 points 1 year ago* (last edited 1 year ago) (1 children)

for some reason it's easier than normal rebasing though

[–] yogo@lemm.ee 3 points 1 year ago (1 children)

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

[–] Blamemeta@lemm.ee 0 points 1 year ago (2 children)

Yeah, but then you deal with merge conflicts

[–] gedhrel@lemmy.ml 2 points 1 year 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.)

[–] dukk@programming.dev 2 points 1 year ago

You can get merge conflicts in cherry picks too, it’s the same process.