alphacyberranger to Programmer HumorEnglish • 11 months agoHistory repeats itselflemmy.worldimagemessage-square35fedilinkarrow-up1486arrow-down113
arrow-up1473arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger to Programmer HumorEnglish • 11 months agomessage-square35fedilink
minus-square@[email protected]linkfedilink3•11 months agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-square@dukklink2•11 months agoYou can get merge conflicts in cherry picks too, it’s the same process.
minus-square@[email protected]linkfedilink2•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.)
Have you tried interactive rebase (rebase -i)? I find it very useful
Yeah, but then you deal with merge conflicts
You can get merge conflicts in cherry picks too, it’s the same process.
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.)