alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square35fedilinkarrow-up1485arrow-down114
arrow-up1471arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square35fedilink
minus-squarefiah@discuss.tchncs.delinkfedilinkarrow-up4·edit-21 year agofor some reason it’s easier than normal rebasing though
minus-squareyogolinkfedilinkarrow-up3·1 year agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-squareThrowawaylinkfedilinkarrow-up1arrow-down1·1 year agoYeah, but then you deal with merge conflicts
minus-squaregedhrel@lemmy.mllinkfedilinkarrow-up2·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-up2·1 year 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.