alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square23fedilinkarrow-up120arrow-down11
arrow-up119arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square23fedilink
minus-squareyogo@lemm.eelinkfedilinkarrow-up1·1 year agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-squareThrowaway@lemm.eelinkfedilinkarrow-up0·1 year agoYeah, but then you deal with merge conflicts
minus-squaregedhrel@lemmy.mllinkfedilinkarrow-up1·1 year agorerere 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.)
minus-squaredukk@programming.devlinkfedilinkarrow-up1·1 year agoYou can get merge conflicts in cherry picks too, it’s the same process.
Have you tried interactive rebase (rebase -i)? I find it very useful
Yeah, but then you deal with merge conflicts
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.)
You can get merge conflicts in cherry picks too, it’s the same process.