alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 11 months agoHistory repeats itselflemmy.worldimagemessage-square35fedilinkarrow-up1483arrow-down113
arrow-up1470arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 11 months agomessage-square35fedilink
minus-squarefiahlinkfedilinkarrow-up4·edit-211 months agofor some reason it’s easier than normal rebasing though
minus-squareyogo@lemm.eelinkfedilinkarrow-up3·11 months agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-squareThrowaway@lemm.eelinkfedilinkarrow-up1arrow-down1·11 months agoYeah, but then you deal with merge conflicts
minus-squaregedhrel@lemmy.mllinkfedilinkarrow-up2·11 months 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-up2·11 months agoYou can get merge conflicts in cherry picks too, it’s the same process.
for some reason it’s easier than normal rebasing though
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.