alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 3 years agoHistory repeats itselflemmy.worldimagemessage-square14linkfedilinkarrow-up1327arrow-down114
arrow-up1313arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 3 years agomessage-square14linkfedilink
minus-squareThrowaway@lemm.eeBannedlinkfedilinkarrow-up0·3 years agoYeah, but then you deal with merge conflicts
minus-squaregedhrel@lemmy.mllinkfedilinkarrow-up0·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-up0·3 years agoYou can get merge conflicts in cherry picks too, it’s the same process.
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.