alphacyberranger to Programmer [email protected]English • 2 years agoHistory repeats itselfimagemessage-square35arrow-up1498arrow-down113
arrow-up1485arrow-down1imageHistory repeats itselfalphacyberranger to Programmer [email protected]English • 2 years agomessage-square35
minus-square@[email protected]linkfedilink2•2 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-square@[email protected]linkfedilink2•2 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.