alphacyberranger to Programmer HumorEnglish • 1 year agoHistory repeats itselflemmy.worldimagemessage-square35fedilinkarrow-up1486arrow-down113
arrow-up1473arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger to Programmer HumorEnglish • 1 year agomessage-square35fedilink
minus-square@[email protected]linkfedilink4•edit-21 year agofor some reason it’s easier than normal rebasing though
minus-square@[email protected]linkfedilink3•1 year agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-square@[email protected]linkfedilink2•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-square@dukklink2•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.