473
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)

for some reason it's easier than normal rebasing though

[-] yogo@lemm.ee 3 points 1 year ago

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

[-] Blamemeta@lemm.ee 0 points 1 year ago

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.)

load more comments (1 replies)
load more comments (1 replies)
load more comments (1 replies)
this post was submitted on 14 Aug 2023
473 points (97.4% liked)

Programmer Humor

18903 readers
370 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