alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 3 years agoHistory repeats itselflemmy.worldimagemessage-square32linkfedilinkarrow-up1460arrow-down112
arrow-up1448arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 3 years agomessage-square32linkfedilink
minus-squareyogo@lemm.eelinkfedilinkarrow-up3·3 years agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-squareThrowaway@lemm.eelinkfedilinkarrow-up1arrow-down1·3 years agoYeah, but then you deal with merge conflicts
minus-squaregedhrel@lemmy.mllinkfedilinkarrow-up2·3 years 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·3 years 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.