alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square28fedilinkarrow-up178arrow-down13
arrow-up175arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square28fedilink
minus-squareyogo@lemm.eelinkfedilinkarrow-up0·1 year agoHave you tried interactive rebase (rebase -i)? I find it very useful
minus-squareThrowaway@lemm.eelinkfedilinkarrow-up0arrow-down1·1 year agoYeah, but then you deal with merge conflicts
minus-squaredukk@programming.devlinkfedilinkarrow-up1·1 year agoYou can get merge conflicts in cherry picks too, it’s the same process.
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.